diff options
| author | Steve Langasek <vorlon@debian.org> | 2009-08-24 13:45:51 -0700 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:25:56 -0800 |
| commit | 9894df123059a56d9ca5ab0bcb06aed7e19cda05 (patch) | |
| tree | e824cd0dfb91b2602491573bc3d815ac650f5d07 /debian/patches-applied/pam_1.0.4_mindays | |
| parent | 78915f5a06936cc24cf7776c8b53d08b6ea3616c (diff) | |
Drop patches pam_unix_thread-safe_save_old_password.patch,
pam_env_ignore_garbage.patch, dont_freeze_password_chain,
pam_1.0.4_mindays, pam_mail-fix-quiet, and
cve-2009-0887-libpam-pam_misc.patch, which are included upstream.
Diffstat (limited to 'debian/patches-applied/pam_1.0.4_mindays')
| -rw-r--r-- | debian/patches-applied/pam_1.0.4_mindays | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/debian/patches-applied/pam_1.0.4_mindays b/debian/patches-applied/pam_1.0.4_mindays deleted file mode 100644 index 0f766e91..00000000 --- a/debian/patches-applied/pam_1.0.4_mindays +++ /dev/null @@ -1,36 +0,0 @@ -Index: debian-pkg-pam/modules/pam_unix/pam_unix_acct.c -=================================================================== ---- debian-pkg-pam.orig/modules/pam_unix/pam_unix_acct.c 2009-04-17 11:30:15.000000000 -0700 -+++ debian-pkg-pam/modules/pam_unix/pam_unix_acct.c 2009-04-17 11:31:25.000000000 -0700 -@@ -250,6 +250,9 @@ - _make_remark(pamh, ctrl, PAM_ERROR_MSG, - _("Your account has expired; please contact your system administrator")); - break; -+ case PAM_AUTHTOK_ERR: -+ retval = PAM_SUCCESS; -+ /* fallthrough */ - case PAM_SUCCESS: - if (daysleft >= 0) { - pam_syslog(pamh, LOG_DEBUG, -Index: debian-pkg-pam/modules/pam_unix/passverify.c -=================================================================== ---- debian-pkg-pam.orig/modules/pam_unix/passverify.c 2009-04-17 11:30:07.000000000 -0700 -+++ debian-pkg-pam/modules/pam_unix/passverify.c 2009-04-17 11:30:59.000000000 -0700 -@@ -301,8 +301,16 @@ - *daysleft = (int)((spent->sp_lstchg + spent->sp_max) - curdays); - D(("warn before expiry")); - } -+ if ((curdays - spent->sp_lstchg < spent->sp_min) -+ && (spent->sp_min != -1)) { -+ /* -+ * The last password change was too recent. This error will be ignored -+ * if no password change is attempted. -+ */ -+ D(("password change too recent")); -+ return PAM_AUTHTOK_ERR; -+ } - return PAM_SUCCESS; -- - } - - /* passwd/salt conversion macros */ |