diff options
author | Steve Langasek <vorlon@debian.org> | 2009-08-24 13:50:54 -0700 |
---|---|---|
committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:25:56 -0800 |
commit | b0f7621ed1b4818eb47e0a91393c3c6cb65b8b3f (patch) | |
tree | 791bf9f4a6860777f5517042deca2e4548926495 /debian/patches-applied/031_pam_include | |
parent | e8b6e844a89e3303214525ad889e78e7b4e55a35 (diff) |
refresh other patches for new upstream release
Diffstat (limited to 'debian/patches-applied/031_pam_include')
-rw-r--r-- | debian/patches-applied/031_pam_include | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches-applied/031_pam_include b/debian/patches-applied/031_pam_include index 32cb0168..23962ad1 100644 --- a/debian/patches-applied/031_pam_include +++ b/debian/patches-applied/031_pam_include @@ -8,18 +8,18 @@ Index: pam.deb/libpam/pam_handlers.c =================================================================== --- pam.deb.orig/libpam/pam_handlers.c +++ pam.deb/libpam/pam_handlers.c -@@ -117,6 +117,10 @@ - module_type = PAM_T_ACCT; - } else if (!strcasecmp("password", tok)) { - module_type = PAM_T_PASS; -+ } else if (!strcasecmp("@include", tok)) { -+ pam_include = 1; -+ module_type = requested_module_type; -+ goto parsing_done; - } else { - /* Illegal module type */ - D(("_pam_init_handlers: bad module type: %s", tok)); -@@ -186,8 +190,10 @@ +@@ -122,6 +122,10 @@ + module_type = PAM_T_ACCT; + } else if (!strcasecmp("password", tok)) { + module_type = PAM_T_PASS; ++ } else if (!strcasecmp("@include", tok)) { ++ pam_include = 1; ++ module_type = requested_module_type; ++ goto parsing_done; + } else { + /* Illegal module type */ + D(("_pam_init_handlers: bad module type: %s", tok)); +@@ -192,8 +196,10 @@ _pam_set_default_control(actions, _PAM_ACTION_BAD); } @@ -30,7 +30,7 @@ Index: pam.deb/libpam/pam_handlers.c if (substack) { res = _pam_add_handler(pamh, PAM_HT_SUBSTACK, other, stack_level, module_type, actions, tok, -@@ -198,13 +204,35 @@ +@@ -204,13 +210,35 @@ return PAM_ABORT; } } |