Do not log that the group was deleted if an error occurred.

diff --git a/ChangeLog b/ChangeLog
index a92611980a0c90695db0df488db2afe68a264548..13e6846c23ebaa4553ab72396606140c4730d1ee 100644 (file)
--- 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 69e49c5590b9c1ca5e213253b5065d0782e201c6..c67ec699c30015e21db428565364d115bd263b53 100644 (file)
--- 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++;