Remove the preprocessor check SHADOWPWD. The variable is no more defined

(and always assumed).  Debian patch 493_pwck_no_SHADOWPWD.

diff --git a/ChangeLog b/ChangeLog
index 372f311528b702de144b55c23d2cd4aef434c295..6c59139ff137fdf49ac2eb6dcdd01cb2852b5bdb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-17  Nicolas François  <nicolas.francois@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@centraliens.net>
 
        * NEWS, src/passwd.c, man/passwd.1.xml: -l/-u options: edit the

diff --git a/NEWS b/NEWS
index cba6931f23e682f9005ddab637864d4de9d4f767..6682ec06d6b3f81580165c6c368fc837a29dc754 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,8 @@ shadow-4.0.18.1 -> shadow-4.0.18.2                                    UNRELEASED
   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
 

diff --git a/src/pwck.c b/src/pwck.c
index b70993cc92a22e922e33010c354f63f894e8bebf..758e8e894c43d02af9be4f2f5b07177abca93cc3 100644 (file)
--- a/src/pwck.c
+++ b/src/pwck.c
@@ -368,7 +368,7 @@ int main (int argc, char **argv)
                                pwd->pw_name, pwd->pw_shell);
                        errors++;
                }
-#ifdef SHADOWPWD
+
                /*
                 * Make sure this entry exists in the /etc/gshadow file.
                 */
@@ -421,7 +421,6 @@ int main (int argc, char **argv)
                                }
                        }
                }
-#endif
        }
 
        if (!is_shadow)