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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-12-28 19:15:14 +0000 (Fri, 28 Dec 2007)
New Revision: 1533

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groupadd.c
Log:
(process_flags): prefer fail_exit to exit. This avoid
an explicit call to audit_logger().


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-12-28 19:08:33 UTC (rev 1532)
+++ upstream/trunk/ChangeLog	2007-12-28 19:15:14 UTC (rev 1533)
@@ -6,6 +6,8 @@
 	Use (!gflg), which is clearer than (!gflg || !oflg).
 	* src/groupadd.c (find_new_gid): find_new_gid is never called when an
 	GID is specified with -g. Simplify find_new_gid accordingly.
+	* src/groupadd.c (process_flags): prefer fail_exit to exit. This avoid
+	an explicit call to audit_logger().
 
 2007-12-28  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/groupadd.c
===================================================================
--- upstream/trunk/src/groupadd.c	2007-12-28 19:08:33 UTC (rev 1532)
+++ upstream/trunk/src/groupadd.c	2007-12-28 19:15:14 UTC (rev 1533)
@@ -453,14 +453,10 @@
 		/* The group already exist */
 		if (fflg) {
 			/* OK, no need to do anything */
-			exit (E_SUCCESS);
+			fail_exit (E_SUCCESS);
 		}
 		fprintf (stderr, _("%s: group %s exists\n"), Prog, group_name);
-#ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-		              "adding group", group_name, -1, 0);
-#endif
-		exit (E_NAME_IN_USE);
+		fail_exit (E_NAME_IN_USE);
 	}
 
 	if (gflg && (getgrgid (group_id) != NULL)) {