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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-02-03 21:40:01 +0000 (Sun, 03 Feb 2008)
New Revision: 1767

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/usermod.c
Log:
No need to check audit_fd, audit_logger() will take care of this.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-02-03 21:37:45 UTC (rev 1766)
+++ upstream/trunk/ChangeLog	2008-02-03 21:40:01 UTC (rev 1767)
@@ -4,6 +4,8 @@
 	/etc/shadow to human readable dates.
 	* src/usermod.c: Really log the expiration date change as human
 	readable strings instead of integers.
+	* src/usermod.c: No need to check audit_fd, audit_logger() will
+	take care of this.
 
 2008-02-03  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2008-02-03 21:37:45 UTC (rev 1766)
+++ upstream/trunk/src/usermod.c	2008-02-03 21:40:01 UTC (rev 1767)
@@ -475,11 +475,9 @@
 		date_to_str (old_exp, sizeof(16),
 		             user_expire * DAY, "never");
 #ifdef WITH_AUDIT
-		if (audit_fd >= 0) {
-			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-				      "changing expiration date", user_newname,
-				      user_newid, 1);
-		}
+		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+		              "changing expiration date", user_newname,
+		              user_newid, 1);
 #endif
 		SYSLOG ((LOG_INFO,
 			 "change user `%s' expiration from `%s' to `%s'",