diff options
| author | markm <markm@FreeBSD.org> | 2001-09-04 17:05:08 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2001-09-04 17:05:08 +0000 |
| commit | 75cc8b4799fb6c83a8a316cecf18cbc2a47601f0 (patch) | |
| tree | 9bc4069fa2bb6d94a906fac75878b70ce250eb1d /lib/libpam | |
| parent | cd61d5ab4817c934f249aeb6e7b6ccf8ee382706 (diff) | |
| download | FreeBSD-src-75cc8b4799fb6c83a8a316cecf18cbc2a47601f0.zip FreeBSD-src-75cc8b4799fb6c83a8a316cecf18cbc2a47601f0.tar.gz | |
1) repair the return value in the PAM_RETURN() macro (Side effects!!).
2) canonicalise the options use in pam_options().
Submitted by: Gunnar Kreitz <gunnark@chello.se>
PR: 30250
Diffstat (limited to 'lib/libpam')
| -rw-r--r-- | lib/libpam/modules/pam_opie/pam_opie.c | 5 |
1 files 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 c68beef..0368fce 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"); |
