diff options
Diffstat (limited to 'libpam')
| -rw-r--r-- | libpam/Makefile.am | 2 | ||||
| -rw-r--r-- | libpam/pam_dispatch.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libpam/Makefile.am b/libpam/Makefile.am index 05d41971..3c816936 100644 --- a/libpam/Makefile.am +++ b/libpam/Makefile.am @@ -20,7 +20,7 @@ include_HEADERS = $(addprefix include/security/, _pam_compat.h _pam_macros.h _pa noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \ pam_modutil_private.h pam_static_modules.h -libpam_la_LDFLAGS = -no-undefined -version-info 81:4:81 @LIBAUDIT@ +libpam_la_LDFLAGS = -no-undefined -version-info 81:5:81 @LIBAUDIT@ if STATIC_MODULES libpam_la_LDFLAGS += `ls ../modules/pam_*/*.lo` \ @LIBDB@ @LIBCRYPT@ @LIBNSL@ @LIBCRACK@ -lutil diff --git a/libpam/pam_dispatch.c b/libpam/pam_dispatch.c index 65c3cbc9..ab032d74 100644 --- a/libpam/pam_dispatch.c +++ b/libpam/pam_dispatch.c @@ -3,7 +3,6 @@ /* * Copyright (c) 1998, 2005 Andrew G. Morgan <morgan@kernel.org> * - * $Id$ */ #include "pam_private.h" @@ -209,7 +208,11 @@ static int _pam_dispatch_aux(pam_handle_t *pamh, int flags, struct handler *h, #endif /* PAM_FAIL_NOW_ON */ if ( impression != _PAM_NEGATIVE ) { impression = _PAM_NEGATIVE; - status = retval; + /* Don't return with PAM_IGNORE as status */ + if ( retval == PAM_IGNORE ) + status = PAM_MUST_FAIL_CODE; + else + status = retval; } if ( action == _PAM_ACTION_DIE ) { goto decision_made; |