summaryrefslogtreecommitdiff
path: root/debian/patches-applied/021_nis_cleanup
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2008-07-26 01:26:51 -0700
committerSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 17:01:53 -0800
commit5f3aec4da1bf24c97d8ab4552b14dbcad4c21f68 (patch)
tree4aba501ed8bf1a06b343c4b354073e7a194f4166 /debian/patches-applied/021_nis_cleanup
parentcb50abee7a0cee22ea15b054b0641ec3320d47aa (diff)
refresh patches for new upstream version
Diffstat (limited to 'debian/patches-applied/021_nis_cleanup')
-rw-r--r--debian/patches-applied/021_nis_cleanup12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-applied/021_nis_cleanup b/debian/patches-applied/021_nis_cleanup
index f3345052..86e80927 100644
--- a/debian/patches-applied/021_nis_cleanup
+++ b/debian/patches-applied/021_nis_cleanup
@@ -3,11 +3,11 @@ Patch from Philippe Troin <phil@fifi.org>
Originally this included a bunch of changes to locking, but the more
recent code pulled from Linux_pam CVS seems to fix that issue.
-Index: Linux-PAM/modules/pam_unix/pam_unix_passwd.c
+Index: pam.deb/modules/pam_unix/pam_unix_passwd.c
===================================================================
---- Linux-PAM/modules/pam_unix/pam_unix_passwd.c.orig
-+++ Linux-PAM/modules/pam_unix/pam_unix_passwd.c
-@@ -1107,7 +1107,7 @@
+--- pam.deb.orig/modules/pam_unix/pam_unix_passwd.c
++++ pam.deb/modules/pam_unix/pam_unix_passwd.c
+@@ -588,7 +588,7 @@
if (_unix_blankpasswd(pamh, ctrl, user)) {
return PAM_SUCCESS;
@@ -16,7 +16,7 @@ Index: Linux-PAM/modules/pam_unix/pam_unix_passwd.c
/* instruct user what is happening */
if (asprintf(&Announce, _("Changing password for %s."),
user) < 0) {
-@@ -1120,7 +1120,9 @@
+@@ -601,7 +601,9 @@
set(UNIX__OLD_PASSWD, lctrl);
retval = _unix_read_password(pamh, lctrl
,Announce
@@ -27,7 +27,7 @@ Index: Linux-PAM/modules/pam_unix/pam_unix_passwd.c
,NULL
,_UNIX_OLD_AUTHTOK
,&pass_old);
-@@ -1131,9 +1133,12 @@
+@@ -612,9 +614,12 @@
"password - (old) token not obtained");
return retval;
}