[Pkg-shadow-commits] r3481 - in upstream/trunk: . src
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Sun Sep 18 17:27:18 UTC 2011
Author: nekral-guest
Date: 2011-09-18 17:27:18 +0000 (Sun, 18 Sep 2011)
New Revision: 3481
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/gpasswd.c
Log:
* src/gpasswd.c: Remove log_gpasswd_success_gshadow(). Writing in
gshadowis the last sub-task.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2011-09-18 17:24:15 UTC (rev 3480)
+++ upstream/trunk/ChangeLog 2011-09-18 17:27:18 UTC (rev 3481)
@@ -1,5 +1,10 @@
2011-09-18 Nicolas François <nicolas.francois at centraliens.net>
+ * src/gpasswd.c: Remove log_gpasswd_success_gshadow(). Writing in
+ gshadowis the last sub-task.
+
+2011-09-18 Nicolas François <nicolas.francois at centraliens.net>
+
* src/chsh.c: No needto remove lines tarting with '#' from
/etc/shells. This is already done by getusershell() and these
shell would fail the access(X_OK) test.
Modified: upstream/trunk/src/gpasswd.c
===================================================================
--- upstream/trunk/src/gpasswd.c 2011-09-18 17:24:15 UTC (rev 3480)
+++ upstream/trunk/src/gpasswd.c 2011-09-18 17:27:18 UTC (rev 3481)
@@ -2,7 +2,7 @@
* Copyright (c) 1990 - 1994, Julianne Frances Haugh
* Copyright (c) 1996 - 2000, Marek Michałkiewicz
* Copyright (c) 2001 - 2006, Tomasz Kłoczko
- * Copyright (c) 2007 - 2009, Nicolas François
+ * Copyright (c) 2007 - 2011, Nicolas François
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -121,9 +121,6 @@
static void log_gpasswd_success (const char *suffix);
static void log_gpasswd_success_system (unused void *arg);
static void log_gpasswd_success_group (unused void *arg);
-#ifdef SHADOWGRP
-static void log_gpasswd_success_gshadow (unused void *arg);
-#endif
/*
* usage - display usage message
@@ -651,16 +648,6 @@
log_gpasswd_success (buf);
}
-#ifdef SHADOWGRP
-static void log_gpasswd_success_gshadow (unused void *arg)
-{
- char buf[1024];
- snprintf (buf, 1023, " in %s", sgr_dbname ());
- buf[1023] = '\0';
- log_gpasswd_success (buf);
-}
-#endif /* SHADOWGRP */
-
/*
* close_files - close and unlock the group databases
*
@@ -690,7 +677,6 @@
Prog, sgr_dbname ());
exit (E_NOPERM);
}
- add_cleanup (log_gpasswd_success_gshadow, NULL);
del_cleanup (log_gpasswd_failure_gshadow);
cleanup_unlock_gshadow (NULL);
@@ -700,11 +686,6 @@
log_gpasswd_success_system (NULL);
del_cleanup (log_gpasswd_success_group);
-#ifdef SHADOWGRP
- if (is_shadowgrp) {
- del_cleanup (log_gpasswd_success_gshadow);
- }
-#endif
}
/*
More information about the Pkg-shadow-commits
mailing list