diff options
| -rw-r--r-- | changelog | 5 | ||||
| -rw-r--r-- | patches-applied/053_pam_unix_user_known_returns_user_unknown | 44 |
2 files changed, 3 insertions, 46 deletions
@@ -7,8 +7,9 @@ pam (0.79-1) UNRELEASED; urgency=low 033_use_gcc_not_ld, 034_pam_dispatch_ignore_PAM_IGNORE, 035_pam_unix_security, 039_pam_mkhomedir_no_maxpathlen_required, 041_call_bootstrap, 042_pam_mkhomedir_dest_not_source_for_errors, - and 051_32_bit_pam_lastlog_ll_time which have been integrated - upstream. + 051_32_bit_pam_lastlog_ll_time, and + 053_pam_unix_user_known_returns_user_unknown which have been + integrated upstream. -- Steve Langasek <vorlon@debian.org> Wed, 13 Jul 2005 03:37:12 -0700 diff --git a/patches-applied/053_pam_unix_user_known_returns_user_unknown b/patches-applied/053_pam_unix_user_known_returns_user_unknown deleted file mode 100644 index 446cabbd..00000000 --- a/patches-applied/053_pam_unix_user_known_returns_user_unknown +++ /dev/null @@ -1,44 +0,0 @@ -? Linux-PAM/modules/pam_unix/dynamic -? Linux-PAM/modules/pam_unix/unix_chkpwd -Index: Linux-PAM/modules/pam_unix/support.c -=================================================================== -RCS file: /afs/sipb.mit.edu/project/debian/cvs/pam/Linux-PAM/modules/pam_unix/support.c,v -retrieving revision 1.9 -diff -u -r1.9 support.c ---- Linux-PAM/modules/pam_unix/support.c 24 Mar 2004 00:51:56 -0000 1.9 -+++ Linux-PAM/modules/pam_unix/support.c 24 Mar 2004 01:46:20 -0000 -@@ -516,7 +516,7 @@ - char *salt = NULL; - char *pp = NULL; - char *data_name; -- int retval; -+ int retval, user_notfound = 0; - - D(("called")); - -@@ -532,8 +532,10 @@ - D(("locating user's record")); - - /* UNIX passwords area */ -+ errno = 0; - pwd = getpwnam(name); /* Get password file entry... */ -- -+ if (pwd == NULL && errno == 0) -+ user_notfound = 1; - if (pwd != NULL) { - if (strcmp( pwd->pw_passwd, "*NP*" ) == 0) - { /* NIS+ */ -@@ -602,11 +604,11 @@ - "check pass; user (%s) unknown", name); - } else { - name = NULL; -- _log_err(LOG_ERR, pamh, -+ _log_err(LOG_WARNING, pamh, - "check pass; user unknown"); - } - p = NULL; -- retval = PAM_AUTHINFO_UNAVAIL; -+ retval = user_notfound ?PAM_USER_UNKNOWN : PAM_AUTHINFO_UNAVAIL; - } - } else { - int salt_len = strlen(salt); |