summaryrefslogtreecommitdiff
path: root/debian/patches-applied/pam_unix_thread-safe_save_old_password.patch
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2009-08-24 13:45:51 -0700
committerSteve Langasek <vorlon@debian.org>2019-01-08 21:25:56 -0800
commit9894df123059a56d9ca5ab0bcb06aed7e19cda05 (patch)
treee824cd0dfb91b2602491573bc3d815ac650f5d07 /debian/patches-applied/pam_unix_thread-safe_save_old_password.patch
parent78915f5a06936cc24cf7776c8b53d08b6ea3616c (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_unix_thread-safe_save_old_password.patch')
-rw-r--r--debian/patches-applied/pam_unix_thread-safe_save_old_password.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/debian/patches-applied/pam_unix_thread-safe_save_old_password.patch b/debian/patches-applied/pam_unix_thread-safe_save_old_password.patch
deleted file mode 100644
index 67957d41..00000000
--- a/debian/patches-applied/pam_unix_thread-safe_save_old_password.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Patch to keep save_old_password() thread-safe when called by the PAM
-module, since nothing blocks other threads from calling getpwnam in
-parallel
-
-Authors: Steve Langasek <vorlon@debian.org>
-
-Upstream status: committed to CVS
-
-Index: pam.deb/modules/pam_unix/passverify.c
-===================================================================
---- pam.deb.orig/modules/pam_unix/passverify.c
-+++ pam.deb/modules/pam_unix/passverify.c
-@@ -535,9 +535,15 @@
- }
- #endif
-
-+#ifdef HELPER_COMPILE
- int
- save_old_password(const char *forwho, const char *oldpass,
- int howmany)
-+#else
-+int
-+save_old_password(pam_handle_t *pamh, const char *forwho, const char *oldpass,
-+ int howmany)
-+#endif
- {
- static char buf[16384];
- static char nbuf[16384];
-@@ -653,7 +659,7 @@
- fclose(opwfile);
-
- if (!found) {
-- pwd = getpwnam(forwho);
-+ pwd = pam_modutil_getpwnam(pamh, forwho);
- if (pwd == NULL) {
- err = 1;
- } else {
-Index: pam.deb/modules/pam_unix/passverify.h
-===================================================================
---- pam.deb.orig/modules/pam_unix/passverify.h
-+++ pam.deb/modules/pam_unix/passverify.h
-@@ -33,9 +33,15 @@
- void
- unlock_pwdf(void);
-
-+#ifdef HELPER_COMPILE
- int
- save_old_password(const char *forwho, const char *oldpass,
- int howmany);
-+#else
-+int
-+save_old_password(pam_handle_t *pamh, const char *forwho, const char *oldpass,
-+ int howmany);
-+#endif
-
- #ifdef HELPER_COMPILE
- void
-Index: pam.deb/modules/pam_unix/pam_unix_passwd.c
-===================================================================
---- pam.deb.orig/modules/pam_unix/pam_unix_passwd.c
-+++ pam.deb/modules/pam_unix/pam_unix_passwd.c
-@@ -378,7 +378,7 @@
- return _unix_run_update_binary(pamh, ctrl, forwho, fromwhat, towhat, remember);
- #endif
- /* first, save old password */
-- if (save_old_password(forwho, fromwhat, remember)) {
-+ if (save_old_password(pamh, forwho, fromwhat, remember)) {
- retval = PAM_AUTHTOK_ERR;
- goto done;
- }