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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-06-13 21:19:07 +0000 (Fri, 13 Jun 2008)
New Revision: 2161

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groupadd.c
Log:
	* src/groupadd.c: The ID argument of audit_logger is an unsigned
	int. Use AUDIT_NO_ID instead of -1.
	* src/groupadd.c: Cast the parsed GID/UID to a gid_t/uid_t.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-06-13 21:16:01 UTC (rev 2160)
+++ upstream/trunk/ChangeLog	2008-06-13 21:19:07 UTC (rev 2161)
@@ -1,5 +1,11 @@
 2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/groupadd.c: The ID argument of audit_logger is an unsigned
+	int. Use AUDIT_NO_ID instead of -1.
+	* src/groupadd.c: Cast the parsed GID/UID to a gid_t/uid_t.
+
+2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/pwck.c: Use a %lu format and cast group and user IDs to
 	unsigned long integers.
 	* src/pwck.c: Cast number of days to a long integer.

Modified: upstream/trunk/src/groupadd.c
===================================================================
--- upstream/trunk/src/groupadd.c	2008-06-13 21:16:01 UTC (rev 2160)
+++ upstream/trunk/src/groupadd.c	2008-06-13 21:19:07 UTC (rev 2161)
@@ -205,8 +205,9 @@
 	}
 #endif				/* SHADOWGRP */
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group", group_name,
-	              group_id, 1);
+	audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+	              "adding group",
+	              group_name, (unsigned int) group_id, 1);
 #endif
 	SYSLOG ((LOG_INFO, "new group: name=%s, GID=%u",
 	        group_name, (unsigned int) group_id));
@@ -269,16 +270,18 @@
 	if (gr_lock () == 0) {
 		fprintf (stderr, _("%s: unable to lock group file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "locking group file",
-		              group_name, -1, 0);
+		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		              "locking group file",
+		              group_name, AUDIT_NO_ID, 0);
 #endif
 		exit (E_GRP_UPDATE);
 	}
 	if (gr_open (O_RDWR) == 0) {
 		fprintf (stderr, _("%s: unable to open group file\n"), Prog);
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "opening group file",
-		              group_name, -1, 0);
+		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		              "opening group file",
+		              group_name, AUDIT_NO_ID, 0);
 #endif
 		fail_exit (E_GRP_UPDATE);
 	}
@@ -310,8 +313,9 @@
 
 #ifdef WITH_AUDIT
 	if (code != E_SUCCESS) {
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group",
-		              group_name, -1, 0);
+		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		              "adding group",
+		              group_name, AUDIT_NO_ID, 0);
 	}
 #endif
 
@@ -340,7 +344,7 @@
 		         Prog, gidstr);
 		exit (E_BAD_ARG);
 	}
-	return val;
+	return (gid_t) val;
 }
 
 /*