diff options
| author | Steve Langasek <vorlon@debian.org> | 2009-08-25 01:17:34 -0700 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:25:56 -0800 |
| commit | a852177c4fde4f21ca20abba1ca8d9db06824102 (patch) | |
| tree | 8231cb0fd1f73de3bb882f00db50217ed4126dd0 /debian/patches-applied/007_modules_pam_unix | |
| parent | f0a0a0150498209b9363ed088e1c6809a097d8f5 (diff) | |
| download | pam-a852177c4fde4f21ca20abba1ca8d9db06824102.tar.gz pam-a852177c4fde4f21ca20abba1ca8d9db06824102.tar.bz2 pam-a852177c4fde4f21ca20abba1ca8d9db06824102.zip | |
debian/patches/007_modules_pam_unix: drop divergence from upstream
that treats "0" as a special value in various fields in /etc/shadow,
and document this in debian/NEWS. Thanks to Nicolas François
<nicolas.francois@centraliens.net> for the detailed analysis.
Closes: #308229.
Diffstat (limited to 'debian/patches-applied/007_modules_pam_unix')
| -rw-r--r-- | debian/patches-applied/007_modules_pam_unix | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/debian/patches-applied/007_modules_pam_unix b/debian/patches-applied/007_modules_pam_unix index 3a8446c7..8eedeaea 100644 --- a/debian/patches-applied/007_modules_pam_unix +++ b/debian/patches-applied/007_modules_pam_unix @@ -598,48 +598,6 @@ Index: pam.deb/modules/pam_unix/pam_unix_sess.c retval = pam_get_item(pamh, PAM_USER, (void *) &user_name); if (user_name == NULL || *user_name == '\0' || retval != PAM_SUCCESS) { -Index: pam.deb/modules/pam_unix/passverify.c -=================================================================== ---- pam.deb.orig/modules/pam_unix/passverify.c -+++ pam.deb/modules/pam_unix/passverify.c -@@ -240,7 +240,9 @@ - *daysleft = -1; - curdays = (long int)(time(NULL) / (60 * 60 * 24)); - D(("today is %d, last change %d", curdays, spent->sp_lstchg)); -- if ((curdays > spent->sp_expire) && (spent->sp_expire != -1)) { -+ if ((curdays > spent->sp_expire) && (spent->sp_expire != -1) -+ && (spent->sp_expire != 0)) -+ { - D(("account expired")); - return PAM_ACCT_EXPIRED; - } -@@ -258,17 +260,23 @@ - if ((curdays - spent->sp_lstchg > spent->sp_max) - && (curdays - spent->sp_lstchg > spent->sp_inact) - && (curdays - spent->sp_lstchg > spent->sp_max + spent->sp_inact) -- && (spent->sp_max != -1) && (spent->sp_inact != -1)) { -+ && (spent->sp_max != -1) && (spent->sp_max != 0) -+ && (spent->sp_inact != -1) && (spent->sp_inact != 0)) -+ { - *daysleft = (int)((spent->sp_lstchg + spent->sp_max) - curdays); - D(("authtok expired")); - return PAM_AUTHTOK_EXPIRED; - } -- if ((curdays - spent->sp_lstchg > spent->sp_max) && (spent->sp_max != -1)) { -+ if ((curdays - spent->sp_lstchg > spent->sp_max) -+ && (spent->sp_max != -1) && (spent->sp_max != 0)) -+ { - D(("need a new password 2")); - return PAM_NEW_AUTHTOK_REQD; - } - if ((curdays - spent->sp_lstchg > spent->sp_max - spent->sp_warn) -- && (spent->sp_max != -1) && (spent->sp_warn != -1)) { -+ && (spent->sp_max != -1) && (spent->sp_warn != -1) -+ && (spent->sp_max != 0) && (spent->sp_warn != 0)) -+ { - *daysleft = (int)((spent->sp_lstchg + spent->sp_max) - curdays); - D(("warn before expiry")); - } Index: pam.deb/modules/pam_unix/pam_unix.8 =================================================================== --- pam.deb.orig/modules/pam_unix/pam_unix.8 |