Relevant BUGIDs: BRC#196859

Purpose of commit: bugfix

Commit summary:
---------------

2006-08-01  Thorsten Kukuk  <kukuk@thkukuk.de>

        * libpam/Makefile.am: Bump patchlevel of libpam.
        * libpam/pam_dispatch.c (_pam_dispatch_aux): If [return=die]
        or [return=bad] is used, don't return PAM_IGNORE. Based on
        patch by Tomas Mraz <t8m@centrum.cz>, [BRC#196859].

diff --git a/ChangeLog b/ChangeLog
index 882996fc6431deb5800255cdfe6887377eb170d8..de30b6a02935b7d1d4945ba7d7e117f0323b7f80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-01  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * libpam/Makefile.am: Bump patchlevel of libpam.
+       * libpam/pam_dispatch.c (_pam_dispatch_aux): If [return=die]
+       or [return=bad] is used, don't return PAM_IGNORE. Based on
+        patch by Tomas Mraz <t8m@centrum.cz>, [BRC#196859].
+
 2006-07-28  Thorsten Kukuk  <kukuk@thkukuk.de>
 
        * ABOUT-NLS: Upgrade to gettext-0.15.

diff --git a/libpam/Makefile.am b/libpam/Makefile.am
index 05d41971c5bfd11fb45a9ceb490a006320d3cc1c..3c816936e3d07cc21ffb07548aef27a4d4c1e412 100644 (file)
--- 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 65c3cbc9d178d95da63357e4c7cdb5599b93725e..ab032d74b1fcf7a712f97bfb539b48f0308e5b77 100644 (file)
--- 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;