diff options
| author | Tomas Mraz <tm@t8m.info> | 2005-01-07 15:31:26 +0000 |
|---|---|---|
| committer | Tomas Mraz <tm@t8m.info> | 2005-01-07 15:31:26 +0000 |
| commit | 8371672714bbe3a7c171143a657083271cad7c71 (patch) | |
| tree | 926b7b38b7c0ce98dcfe15c58296cf7fe15f774c /modules/pam_nologin | |
| parent | c75c3ff9f2c3d221aabe89b8d0779f041e71e30c (diff) | |
| download | pam-8371672714bbe3a7c171143a657083271cad7c71.tar.gz pam-8371672714bbe3a7c171143a657083271cad7c71.tar.bz2 pam-8371672714bbe3a7c171143a657083271cad7c71.zip | |
Relevant BUGIDs: 629251, Red Hat bz 143750
Purpose of commit: bugfix
Commit summary:
---------------
libpam: don't return PAM_IGNORE if the impression is positive and
using cached chain
pam_nologin: don't overwrite return value with return from pam_get_item
Diffstat (limited to 'modules/pam_nologin')
| -rw-r--r-- | modules/pam_nologin/pam_nologin.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/pam_nologin/pam_nologin.c b/modules/pam_nologin/pam_nologin.c index 433d2e11..bfd17753 100644 --- a/modules/pam_nologin/pam_nologin.c +++ b/modules/pam_nologin/pam_nologin.c @@ -125,9 +125,8 @@ static int perform_check(pam_handle_t *pamh, struct opt_s *opts) * of /etc/nologin */ - retval = pam_get_item(pamh, PAM_CONV, - (const void **)&conversation); - if ((retval == PAM_SUCCESS) && (conversation)) { + if (pam_get_item(pamh, PAM_CONV, (const void **)&conversation) + == PAM_SUCCESS && conversation && conversation->conv) { (void) conversation->conv(1, (const struct pam_message **)&pmessage, &resp, conversation->appdata_ptr); |