When compiled without AUDIT support, if the return code was E_SUCCESS,

fail_exit() wouldn't have exited. Fix the scope of #idef WITH_AUDIT.

diff --git a/ChangeLog b/ChangeLog
index 49e895903905ac23df187775fa53a16119cdd5d5..251902b3aaf3b7d3a7f7ba25e2a0641c62b36e15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-27  Nicolas François  <nicolas.francois@centraliens.net>
+
+       src/groupadd.c cleanup
+       * src/groupadd.c (fail_exit): When compiled without AUDIT support, if
+       the return code was E_SUCCESS, fail_exit() wouldn't have exited. Fix
+       the scope of #idef WITH_AUDIT.
+
 2007-12-27  Nicolas François  <nicolas.francois@centraliens.net>
 
        libmisc/copydir.c cleanup

diff --git a/src/groupadd.c b/src/groupadd.c
index 4dae0d04f4b6f25bc13f94f4ac990cb5847e0647..8b47653c99ddf56a53506cc51880270a81975cb9 100644 (file)
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -346,8 +346,8 @@ static void fail_exit (int code)
        if (is_shadow_grp)
                sgr_unlock ();
 #endif
-       if (code != E_SUCCESS)
 #ifdef WITH_AUDIT
+       if (code != E_SUCCESS)
                audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group",
                              group_name, -1, 0);
 #endif