diff options
| author | Sam Hartman <hartmans@debian.org> | 2021-07-09 09:13:45 -0600 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2021-09-15 17:52:39 -0700 |
| commit | d65356369c85b25134f159279a10fee3aa96b655 (patch) | |
| tree | 012d14d185770ee10308814f3d0f0237030e9e62 | |
| parent | 7bd7acff5fe29a9322d62e8f19b72c097546af1f (diff) | |
| download | pam-d65356369c85b25134f159279a10fee3aa96b655.tar.gz pam-d65356369c85b25134f159279a10fee3aa96b655.tar.bz2 pam-d65356369c85b25134f159279a10fee3aa96b655.zip | |
Fix pam-modules not in multiarch paths
* debian/patches-applied/lib_security_multiarch_compat
- Fix regression introduced in 1.4.0-1: search both /lib/security and
/lib/[multiarch]/security/], Closes: #990790
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/patches-applied/lib_security_multiarch_compat | 21 |
2 files changed, 27 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 03358422..d0fd74ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pam (1.4.0-8) unstable; urgency=high + + [ Hideki Yamane ] + * debian/patches-applied/lib_security_multiarch_compat + - Fix regression introduced in 1.4.0-1: search both /lib/security and + /lib/[multiarch_tripple]/security/, Closes: #990790 + + [ Sam Hartman ] + * Reword changelog + + -- Hideki Yamane <henrich@debian.org> Tue, 06 Jul 2021 22:09:15 +0900 + pam (1.4.0-7) unstable; urgency=medium * Updated portuguese debconf translation, thanks Pedro Ribeiro, Closes: diff --git a/debian/patches-applied/lib_security_multiarch_compat b/debian/patches-applied/lib_security_multiarch_compat index c43a733e..e386ff39 100644 --- a/debian/patches-applied/lib_security_multiarch_compat +++ b/debian/patches-applied/lib_security_multiarch_compat @@ -11,11 +11,11 @@ currently abusing the existing variables and inverting their meaning in order to get everything installed where we want it and get absolute paths the way we want them. -Index: pam/libpam/pam_handlers.c +Index: pam-1.4.0/libpam/pam_handlers.c =================================================================== ---- pam.orig/libpam/pam_handlers.c -+++ pam/libpam/pam_handlers.c -@@ -735,7 +735,18 @@ +--- pam-1.4.0.orig/libpam/pam_handlers.c ++++ pam-1.4.0/libpam/pam_handlers.c +@@ -735,7 +735,27 @@ _pam_load_module(pam_handle_t *pamh, con success = PAM_ABORT; D(("_pam_load_module: _pam_dlopen(%s)", mod_path)); @@ -31,11 +31,20 @@ Index: pam/libpam/pam_handlers.c + } else { + pam_syslog(pamh, LOG_CRIT, "cannot malloc full mod path"); + } ++ if (!mod->dl_handle) { ++ if (asprintf(&mod_full_path, "%s/%s", ++ _PAM_ISA, mod_path) >= 0) { ++ mod->dl_handle = _pam_dlopen(mod_full_path); ++ _pam_drop(mod_full_path); ++ } else { ++ pam_syslog(pamh, LOG_CRIT, "cannot malloc full mod path"); ++ } ++ } + } D(("_pam_load_module: _pam_dlopen'ed")); D(("_pam_load_module: dlopen'ed")); if (mod->dl_handle == NULL) { -@@ -812,7 +823,6 @@ +@@ -812,7 +832,6 @@ int _pam_add_handler(pam_handle_t *pamh struct handler **handler_p2; struct handlers *the_handlers; const char *sym, *sym2; @@ -43,7 +52,7 @@ Index: pam/libpam/pam_handlers.c servicefn func, func2; int mod_type = PAM_MT_FAULTY_MOD; -@@ -824,16 +834,7 @@ +@@ -824,16 +843,7 @@ int _pam_add_handler(pam_handle_t *pamh if ((handler_type == PAM_HT_MODULE || handler_type == PAM_HT_SILENT_MODULE) && mod_path != NULL) { |