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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-06-13 20:59:04 +0000 (Fri, 13 Jun 2008)
New Revision: 2154

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groupdel.c
Log:
	* src/groupdel.c: The ID argument of audit_logger is an unsigned
	int. Use AUDIT_NO_ID instead of -1.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-06-13 20:57:20 UTC (rev 2153)
+++ upstream/trunk/ChangeLog	2008-06-13 20:59:04 UTC (rev 2154)
@@ -1,5 +1,10 @@
 2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/groupdel.c: The ID argument of audit_logger is an unsigned
+	int. Use AUDIT_NO_ID instead of -1.
+
+2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/expiry.c: Ignore the return value of signal().
 
 2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/src/groupdel.c
===================================================================
--- upstream/trunk/src/groupdel.c	2008-06-13 20:57:20 UTC (rev 2153)
+++ upstream/trunk/src/groupdel.c	2008-06-13 20:59:04 UTC (rev 2154)
@@ -100,8 +100,9 @@
 #endif
 
 #ifdef	WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group",
-	              group_name, -1, 0);
+	audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+	              "deleting group",
+	              group_name, AUDIT_NO_ID, 0);
 #endif
 
 	exit (code);
@@ -143,8 +144,9 @@
 static void close_files (void)
 {
 #ifdef WITH_AUDIT
-	audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group", group_name,
-	              group_id, 1);
+	audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+	              "deleting group",
+	              group_name, (unsigned int) group_id, 1);
 #endif
 	SYSLOG ((LOG_INFO, "remove group `%s'\n", group_name));
 
@@ -317,8 +319,8 @@
 				 Prog, group_name);
 #ifdef WITH_AUDIT
 			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-				      "deleting group",
-				      group_name, -1, 0);
+			              "deleting group",
+			              group_name, AUDIT_NO_ID, 0);
 #endif
 			exit (E_NOTFOUND);
 		}
@@ -338,8 +340,9 @@
 			 Prog, group_name);
 
 #ifdef WITH_AUDIT
-		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group",
-			      group_name, -1, 0);
+		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		              "deleting group",
+		              group_name, AUDIT_NO_ID, 0);
 #endif
 		if (!yp_get_default_domain (&nis_domain) &&
 		    !yp_master (nis_domain, "group.byname", &nis_master)) {