rooty/yubico-pam
1
0
Fork 0
mirror of https://github.com/Yubico/yubico-pam.git synced 2025-02-01 01:52:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix ykc handling.

Browse Source
This commit is contained in:
Simon Josefsson 2009-03-24 14:30:57 +00:00
parent 751962c4b5
commit 7f1a398141
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pam_yubico.c
View File

@ -394,7 +394,7 @@ pam_sm_authenticate (pam_handle_t * pamh,
struct pam_message *pmsg[1], msg[1]; struct pam_message *pmsg[1], msg[1];
struct pam_response *resp; struct pam_response *resp;
int nargs = 1; int nargs = 1;
yubikey_client_t ykc; yubikey_client_t ykc = NULL;
struct cfg cfg; struct cfg cfg;
parse_cfg (flags, argc, argv, &cfg); parse_cfg (flags, argc, argv, &cfg);
@ -434,6 +434,10 @@ pam_sm_authenticate (pam_handle_t * pamh,
goto done; goto done;
} }
yubikey_client_set_info (ykc, cfg.client_id, 0, NULL);
if (cfg.url)
yubikey_client_set_url_template (ykc, cfg.url);
if (password == NULL) if (password == NULL)
{ {
retval = pam_get_item (pamh, PAM_CONV, (const void **) &conv); retval = pam_get_item (pamh, PAM_CONV, (const void **) &conv);
@ -489,11 +493,6 @@ pam_sm_authenticate (pam_handle_t * pamh,
} }
} }
yubikey_client_set_info (ykc, cfg.client_id, 0, NULL);
if (cfg.url)
yubikey_client_set_url_template (ykc, cfg.url);
/* user will enter there system paasword followed by generated OTP */ /* user will enter there system paasword followed by generated OTP */
token_otp_with_password = (char *) password; token_otp_with_password = (char *) password;
password_len = strlen (token_otp_with_password); password_len = strlen (token_otp_with_password);
@ -551,23 +550,23 @@ pam_sm_authenticate (pam_handle_t * pamh,
rc = yubikey_client_request (ykc, (const char *) token_otp); rc = yubikey_client_request (ykc, (const char *) token_otp);
DBG (("libyubikey-client return value (%d): %s", rc,
yubikey_client_strerror (rc)));
if (token_password != NULL) if (token_password != NULL)
free (token_password); free (token_password);
DBG (("libyubikey-client return value (%d): %s", rc,
yubikey_client_strerror (rc)));
if (rc != YUBIKEY_CLIENT_OK) if (rc != YUBIKEY_CLIENT_OK)
{ {
retval = PAM_SERVICE_ERR; retval = PAM_SERVICE_ERR;
goto done; goto done;
} }
yubikey_client_done (&ykc);
retval = PAM_SUCCESS; retval = PAM_SUCCESS;
done: done:
if (ykc)
yubikey_client_done (&ykc);
if (cfg.alwaysok && retval != PAM_SUCCESS) if (cfg.alwaysok && retval != PAM_SUCCESS)
{ {
DBG (("alwaysok needed (otherwise return with %d)", retval)); DBG (("alwaysok needed (otherwise return with %d)", retval));