summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2008-07-26 14:12:30 -0700
committerSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 17:01:54 -0800
commit58bcdf7acba0a38f0a3909f0adfa61626c12f15a (patch)
tree1b94b056ac84ce8564927e45bddc3539d9d2e7c0
parentd7e2c1d781e27ebb2a4d31472cae3592f19dcd7e (diff)
s/name/user/, now that this code is in a different function
-rw-r--r--debian/patches-applied/055_pam_unix_nullok_secure8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-applied/055_pam_unix_nullok_secure b/debian/patches-applied/055_pam_unix_nullok_secure
index 7eb1dd12..0ea5eec1 100644
--- a/debian/patches-applied/055_pam_unix_nullok_secure
+++ b/debian/patches-applied/055_pam_unix_nullok_secure
@@ -39,16 +39,16 @@ Index: pam.deb/modules/pam_unix/support.c
}
}
-@@ -456,7 +463,7 @@
+@@ -457,7 +464,7 @@
/* exec binary helper */
args[0] = strdup(CHKPWD_HELPER);
args[1] = x_strdup(user);
- if (off(UNIX__NONULL, ctrl)) { /* this means we've succeeded */
-+ if (_unix_blankpasswd(pamh, ctrl, name)) { /* this means we've succeeded */
++ if (_unix_blankpasswd(pamh, ctrl, user)) { /* this means we've succeeded */
args[2]=strdup("nullok");
} else {
args[2]=strdup("nonull");
-@@ -553,6 +560,17 @@
+@@ -554,6 +561,17 @@
if (salt)
_pam_delete(salt);
@@ -66,7 +66,7 @@ Index: pam.deb/modules/pam_unix/support.c
return retval;
}
-@@ -612,7 +630,8 @@
+@@ -613,7 +631,8 @@
}
}
} else {