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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-17 16:50:26 +0000 (Sat, 17 Nov 2007)
New Revision: 1372

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/pwck.c
Log:
Remove the preprocessor check SHADOWPWD. The variable is no more defined
(and always assumed).  Debian patch 493_pwck_no_SHADOWPWD.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-17 16:43:00 UTC (rev 1371)
+++ upstream/trunk/ChangeLog	2007-11-17 16:50:26 UTC (rev 1372)
@@ -1,5 +1,11 @@
 2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* NEWS, src/pwck.c: Remove the preprocessor check SHADOWPWD. The
+	variable is no more defined (and always assumed).
+	Debian patch 493_pwck_no_SHADOWPWD.
+
+2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* NEWS, src/passwd.c, man/passwd.1.xml: -l/-u options: edit the
 	shadow account expiry field *in addition* to editing the password
 	field.  Debian patch 494_passwd_lock.

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2007-11-17 16:43:00 UTC (rev 1371)
+++ upstream/trunk/NEWS	2007-11-17 16:50:26 UTC (rev 1372)
@@ -37,6 +37,8 @@
   her primary group.  Debian patch 497_newgrp_primary_group.
 - passwd: -l/-u options: edit the shadow account expiry field *in
   addition* to editing the password field.  Debian patch 494_passwd_lock.
+- pwck: Remove the SHADOWPWD preprocessor check. Some check for /etc/shadow
+  were always missing.
 
 shadow-4.0.18.1 -> shadow-4.0.18.2					28-10-2007
 

Modified: upstream/trunk/src/pwck.c
===================================================================
--- upstream/trunk/src/pwck.c	2007-11-17 16:43:00 UTC (rev 1371)
+++ upstream/trunk/src/pwck.c	2007-11-17 16:50:26 UTC (rev 1372)
@@ -368,7 +368,7 @@
 				pwd->pw_name, pwd->pw_shell);
 			errors++;
 		}
-#ifdef SHADOWPWD
+
 		/*
 		 * Make sure this entry exists in the /etc/gshadow file.
 		 */
@@ -421,7 +421,6 @@
 				}
 			}
 		}
-#endif
 	}
 
 	if (!is_shadow)