summaryrefslogtreecommitdiff
path: root/debian/patches-applied/pam_env_ignore_garbage.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_env_ignore_garbage.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_env_ignore_garbage.patch')
-rw-r--r--debian/patches-applied/pam_env_ignore_garbage.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/debian/patches-applied/pam_env_ignore_garbage.patch b/debian/patches-applied/pam_env_ignore_garbage.patch
deleted file mode 100644
index 3df76a07..00000000
--- a/debian/patches-applied/pam_env_ignore_garbage.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Patch for Debian bug #439984
-
-pam_env was not correctly skipping over non-alphanumeric variable names,
-and was not handling the PAM_BAD_ITEM error return from pam_putenv()
-when clearing an unset variable.
-
-Authors: Steve Langasek <vorlon@debian.org>
-
-Upstream status: committed to CVS
-
-Index: pam/Linux-PAM/modules/pam_env/pam_env.c
-===================================================================
---- pam.orig/Linux-PAM/modules/pam_env/pam_env.c
-+++ pam/Linux-PAM/modules/pam_env/pam_env.c
-@@ -232,9 +232,14 @@
-
- for ( i = 0 ; key[i] != '=' && key[i] != '\0' ; i++ )
- if (!isalnum(key[i]) && key[i] != '_') {
-- D(("key is not alpha numeric - '%s', ignoring", key));
-- continue;
-+ pam_syslog(pamh, LOG_ERR,
-+ "non-alphanumeric key '%s' in %s', ignoring",
-+ key, file);
-+ break;
- }
-+ /* non-alphanumeric key, ignore this line */
-+ if (key[i] != '=' && key[i] != '\0')
-+ continue;
-
- /* now we try to be smart about quotes around the value,
- but not too smart, we can't get all fancy with escaped
-@@ -248,6 +253,14 @@
- key[i] = '\0';
- }
-
-+ /* if this is a request to delete a variable, check that it's
-+ actually set first, so we don't get a vague error back from
-+ pam_putenv() */
-+ for (i = 0; key[i] != '=' && key[i] != '\0'; i++);
-+
-+ if (key[i] == '\0' && !pam_getenv(pamh,key))
-+ continue;
-+
- /* set the env var, if it fails, we break out of the loop */
- retval = pam_putenv(pamh, key);
- if (retval != PAM_SUCCESS) {