diff options
Diffstat (limited to 'debian/patches-applied')
-rw-r--r-- | debian/patches-applied/no_helper_for_nis+.patch | 31 | ||||
-rw-r--r-- | debian/patches-applied/series | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches-applied/no_helper_for_nis+.patch b/debian/patches-applied/no_helper_for_nis+.patch new file mode 100644 index 00000000..da9a03ad --- /dev/null +++ b/debian/patches-applied/no_helper_for_nis+.patch @@ -0,0 +1,31 @@ +Don't force use of the helper for account verification with NIS+; the +previous code already works robustly for any non-threaded caller, and +will fall back to use of the helper anyway. + +Authors: Steve Langasek <steve.langasek@canonical.com> + +Upstream status: to be discussed + +Index: pam.deb/modules/pam_unix/passverify.c +=================================================================== +--- pam.deb.orig/modules/pam_unix/passverify.c ++++ pam.deb/modules/pam_unix/passverify.c +@@ -166,7 +166,6 @@ + if (*pwd != NULL) { + if (strcmp((*pwd)->pw_passwd, "*NP*") == 0) + { /* NIS+ */ +-#ifdef HELPER_COMPILE + uid_t save_euid, save_uid; + + save_euid = geteuid(); +@@ -194,10 +193,6 @@ + + if (*spwdent == NULL || (*spwdent)->sp_pwdp == NULL) + return PAM_AUTHINFO_UNAVAIL; +-#else +- /* we must run helper for NIS+ passwords */ +- return PAM_UNIX_RUN_HELPER; +-#endif + } else if (is_pwd_shadowed(*pwd)) { + /* + * ...and shadow password file entry for this user, diff --git a/debian/patches-applied/series b/debian/patches-applied/series index 3b410ab1..c67db0e0 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -1,5 +1,6 @@ thread-safe_save_old_password.patch setreuid_juggling.patch +no_helper_for_nis+.patch 007_modules_pam_unix 008_modules_pam_limits_chroot 021_nis_cleanup |