[Pkg-shadow-commits] r1886 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-03-08 16:20:55 +0000 (Sat, 08 Mar 2008)
New Revision: 1886

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groupdel.c
Log:
Do not log that the group was deleted if an error occurred.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-03-08 16:17:07 UTC (rev 1885)
+++ upstream/trunk/ChangeLog	2008-03-08 16:20:55 UTC (rev 1886)
@@ -1,5 +1,10 @@
 2008-03-08  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/groupdel.c: Do not log that the group was deleted if an
+	error occurred.
+
+2008-03-08  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/groupdel.c: Do not raise an error if the group does not
 	exist in the gshadow file.
 

Modified: upstream/trunk/src/groupdel.c
===================================================================
--- upstream/trunk/src/groupdel.c	2008-03-08 16:17:07 UTC (rev 1885)
+++ upstream/trunk/src/groupdel.c	2008-03-08 16:20:55 UTC (rev 1886)
@@ -108,11 +108,6 @@
 		}
 	}
 #endif				/* SHADOWGRP */
-#ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group", group_name,
-		      group_id, 1);
-#endif
-	SYSLOG ((LOG_INFO, "remove group `%s'\n", group_name));
 	return;
 }
 
@@ -124,6 +119,12 @@
  */
 static void close_files (void)
 {
+#ifdef WITH_AUDIT
+	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group", group_name,
+	              group_id, 1);
+#endif
+	SYSLOG ((LOG_INFO, "remove group `%s'\n", group_name));
+
 	if (!gr_close ()) {
 		fprintf (stderr, _("%s: cannot rewrite group file\n"), Prog);
 		errors++;