diff options
author | vorlon <Unknown> | 2005-07-14 05:58:53 +0000 |
---|---|---|
committer | vorlon <Unknown> | 2005-07-14 05:58:53 +0000 |
commit | c920ee5c2d400e4f668efbb02dc45d55dd188571 (patch) | |
tree | 300bcdbeba31258612e6ea0dfb05714586903b26 /patches-applied | |
parent | f9d1a53ea122b29fae0429043f73d68627414dd8 (diff) | |
download | pam-c920ee5c2d400e4f668efbb02dc45d55dd188571.tar.gz pam-c920ee5c2d400e4f668efbb02dc45d55dd188571.tar.bz2 pam-c920ee5c2d400e4f668efbb02dc45d55dd188571.zip |
port patch 045 to 0.79 and apply
Diffstat (limited to 'patches-applied')
-rw-r--r-- | patches-applied/045_pam_dispatch_jump_is_ignore | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/patches-applied/045_pam_dispatch_jump_is_ignore b/patches-applied/045_pam_dispatch_jump_is_ignore index d912ae0f..8fbc6b1f 100644 --- a/patches-applied/045_pam_dispatch_jump_is_ignore +++ b/patches-applied/045_pam_dispatch_jump_is_ignore @@ -6,27 +6,27 @@ to be consistent. Index: Linux-PAM/libpam/pam_dispatch.c =================================================================== -RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpam/pam_dispatch.c,v -retrieving revision 1.4 -diff -u -r1.4 pam_dispatch.c ---- Linux-PAM/libpam/pam_dispatch.c 21 Oct 2002 01:26:28 -0000 1.4 -+++ Linux-PAM/libpam/pam_dispatch.c 21 Jun 2003 20:23:32 -0000 -@@ -230,17 +230,9 @@ +--- Linux-PAM/libpam/pam_dispatch.c (revision 295) ++++ Linux-PAM/libpam/pam_dispatch.c (working copy) +@@ -224,20 +224,8 @@ if ( _PAM_ACTION_IS_JUMP(action) ) { /* If we are evaluating a cached chain, we treat this - module as required (aka _PAM_ACTION_OK) as well as -+ module asignored as well as - executing the jump. */ +- executing the jump. */ ++ module as ignored as well as executing the jump. */ - if (use_cached_chain) { -- if ( retval != PAM_IGNORE -- && (impression == _PAM_UNDEF -- || (impression == _PAM_POSITIVE && status == PAM_SUCCESS) )) { -- impression = _PAM_POSITIVE; -- status = retval; +- if (impression == _PAM_UNDEF +- || (impression == _PAM_POSITIVE +- && status == PAM_SUCCESS) ) { +- if ( retval != PAM_IGNORE || cached_retval == retval ) { +- impression = _PAM_POSITIVE; +- status = retval; +- } - } - } - +- /* this means that we need to skip #action stacked modules */ do { + h = h->next; |