From fb6cb07a603fe38c32de0ea1fa9ace9197984bf0 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 17 Nov 2007 16:50:26 +0000 Subject: [PATCH] Remove the preprocessor check SHADOWPWD. The variable is no more defined (and always assumed). Debian patch 493_pwck_no_SHADOWPWD. --- ChangeLog | 6 ++++++ NEWS | 2 ++ src/pwck.c | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 372f3115..6c59139f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-17 Nicolas François + + * 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 * NEWS, src/passwd.c, man/passwd.1.xml: -l/-u options: edit the diff --git a/NEWS b/NEWS index cba6931f..6682ec06 100644 --- 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 b70993cc..758e8e89 100644 --- 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)