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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-12-28 09:39:22 +0000 (Fri, 28 Dec 2007)
New Revision: 1524

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groupadd.c
Log:
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.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-12-28 00:35:41 UTC (rev 1523)
+++ upstream/trunk/ChangeLog	2007-12-28 09:39:22 UTC (rev 1524)
@@ -1,5 +1,12 @@
 2007-12-27  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	libmisc/copydir.c cleanup
 	* libmisc/copydir.c: Split copy_tree() in more maintainable functions:
 	copy_entry(), copy_dir(), copy_symlink(), copy_hardlink(),

Modified: upstream/trunk/src/groupadd.c
===================================================================
--- upstream/trunk/src/groupadd.c	2007-12-28 00:35:41 UTC (rev 1523)
+++ upstream/trunk/src/groupadd.c	2007-12-28 09:39:22 UTC (rev 1524)
@@ -346,8 +346,8 @@
 	if (is_shadow_grp)
 		sgr_unlock ();
 #endif
+#ifdef WITH_AUDIT
 	if (code != E_SUCCESS)
-#ifdef WITH_AUDIT
 		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group",
 			      group_name, -1, 0);
 #endif