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
This commit is contained in:
Mark Murray 2001-09-04 17:05:08 +00:00
parent 4e6b157062
commit 6e925e8fc7

View File

@ -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");