diff options
Diffstat (limited to 'debian/patches/lib_security_multiarch_compat')
| -rw-r--r-- | debian/patches/lib_security_multiarch_compat | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/debian/patches/lib_security_multiarch_compat b/debian/patches/lib_security_multiarch_compat index 0e7ada42..fb878a41 100644 --- a/debian/patches/lib_security_multiarch_compat +++ b/debian/patches/lib_security_multiarch_compat @@ -15,18 +15,22 @@ 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. --- - libpam/pam_handlers.c | 34 ++++++++++++++++++++++------------ - 1 file changed, 22 insertions(+), 12 deletions(-) + libpam/pam_handlers.c | 40 +++++++++++++++++++++++++--------------- + 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c -index c7045d2..dc5f81f 100644 +index 1df5e40..9838fb2 100644 --- a/libpam/pam_handlers.c +++ b/libpam/pam_handlers.c -@@ -737,7 +737,27 @@ _pam_load_module(pam_handle_t *pamh, const char *mod_path, int handler_type) +@@ -667,10 +667,30 @@ _pam_load_module(pam_handle_t *pamh, const char *mod_path, int handler_type) + /* Be pessimistic... */ success = PAM_ABORT; - D(("_pam_load_module: _pam_dlopen(%s)", mod_path)); +- D(("_pam_dlopen(%s)", mod_path)); - mod->dl_handle = _pam_dlopen(mod_path); +- D(("_pam_dlopen'ed")); +- D(("dlopen'ed")); ++ D(("_pam_load_module: _pam_dlopen(%s)", mod_path)); + if (mod_path[0] == '/') { + mod->dl_handle = _pam_dlopen(mod_path); + } else { @@ -48,10 +52,12 @@ index c7045d2..dc5f81f 100644 + } + } + } - D(("_pam_load_module: _pam_dlopen'ed")); - D(("_pam_load_module: dlopen'ed")); ++ D(("_pam_load_module: _pam_dlopen'ed")); ++ D(("_pam_load_module: dlopen'ed")); if (mod->dl_handle == NULL) { -@@ -814,7 +834,6 @@ int _pam_add_handler(pam_handle_t *pamh + const char *isa = strstr(mod_path, "$ISA"); + size_t isa_len = strlen("$ISA"); +@@ -736,7 +756,6 @@ static int _pam_add_handler(pam_handle_t *pamh struct handler **handler_p2; struct handlers *the_handlers; const char *sym, *sym2; @@ -59,7 +65,7 @@ index c7045d2..dc5f81f 100644 servicefn func, func2; int mod_type = PAM_MT_FAULTY_MOD; -@@ -826,16 +845,7 @@ int _pam_add_handler(pam_handle_t *pamh +@@ -748,16 +767,7 @@ static int _pam_add_handler(pam_handle_t *pamh if ((handler_type == PAM_HT_MODULE || handler_type == PAM_HT_SILENT_MODULE) && mod_path != NULL) { |