From 6e925e8fc722908c912ca7ea576e06d7fd3e2d72 Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Tue, 4 Sep 2001 17:05:08 +0000 Subject: [PATCH] 1) repair the return value in the PAM_RETURN() macro (Side effects!!). 2) canonicalise the options use in pam_options(). Submitted by: Gunnar Kreitz PR: 30250 --- lib/libpam/modules/pam_opie/pam_opie.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libpam/modules/pam_opie/pam_opie.c b/lib/libpam/modules/pam_opie/pam_opie.c index c68beefc26e..0368fcedd69 100644 --- a/lib/libpam/modules/pam_opie/pam_opie.c +++ b/lib/libpam/modules/pam_opie/pam_opie.c @@ -118,7 +118,8 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) * it expects. Thus we can't log an error and can only check for * success or lack thereof. */ - PAM_RETURN(opieverify(&opie, resp) == 0 ? PAM_SUCCESS : PAM_AUTH_ERR); + retval = opieverify(&opie, resp) == 0 ? PAM_SUCCESS : PAM_AUTH_ERR; + PAM_RETURN(retval); } PAM_EXTERN int @@ -126,7 +127,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) { struct options options; - pam_std_option(&options, NULL, argc, argv); + pam_std_option(&options, other_options, argc, argv); PAM_LOG("Options processed");