summaryrefslogtreecommitdiff
path: root/debian/patches-applied/031_pam_include
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2014-01-14 09:30:06 +0000
committerSteve Langasek <vorlon@debian.org>2019-01-08 22:11:52 -0800
commit76063db40810118bf431971dade8871633d06864 (patch)
treebf04fce4c2288ebf24e3465697b25b40a267172e /debian/patches-applied/031_pam_include
parente4b6c30426509601fddd1611f7db99b076626c17 (diff)
Another round of patch refreshing
Diffstat (limited to 'debian/patches-applied/031_pam_include')
-rw-r--r--debian/patches-applied/031_pam_include14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches-applied/031_pam_include b/debian/patches-applied/031_pam_include
index 23962ad1..da689047 100644
--- a/debian/patches-applied/031_pam_include
+++ b/debian/patches-applied/031_pam_include
@@ -4,10 +4,10 @@ Authors: Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>
Upstream status: not yet submitted
-Index: pam.deb/libpam/pam_handlers.c
+Index: pam.debian/libpam/pam_handlers.c
===================================================================
---- pam.deb.orig/libpam/pam_handlers.c
-+++ pam.deb/libpam/pam_handlers.c
+--- pam.debian.orig/libpam/pam_handlers.c
++++ pam.debian/libpam/pam_handlers.c
@@ -122,6 +122,10 @@
module_type = PAM_T_ACCT;
} else if (!strcasecmp("password", tok)) {
@@ -27,13 +27,13 @@ Index: pam.deb/libpam/pam_handlers.c
tok = _pam_StrTok(NULL, " \n\t", &nexttok);
if (pam_include) {
+ struct stat include_dir;
- if (substack) {
+ if (substack) {
res = _pam_add_handler(pamh, PAM_HT_SUBSTACK, other,
- stack_level, module_type, actions, tok,
+ stack_level, module_type, actions, tok,
@@ -204,13 +210,35 @@
return PAM_ABORT;
- }
- }
+ }
+ }
- if (_pam_load_conf_file(pamh, tok, this_service, module_type,
- stack_level + substack
+ if (tok[0] == '/') {