From 9e07fec6ba51349760875b658442f0cb46264fef Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 8 Mar 2008 16:20:55 +0000
Subject: [PATCH] Do not log that the group was deleted if an error occurred.

---
 ChangeLog      |  5 +++++
 src/groupdel.c | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a9261198..13e6846c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-08  Nicolas François  <nicolas.francois@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@centraliens.net>
 
 	* src/groupdel.c: Do not raise an error if the group does not
diff --git a/src/groupdel.c b/src/groupdel.c
index 69e49c55..c67ec699 100644
--- a/src/groupdel.c
+++ b/src/groupdel.c
@@ -108,11 +108,6 @@ static void grp_update (void)
 		}
 	}
 #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 grp_update (void)
  */
 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++;