1
0
mirror of https://github.com/Yubico/yubico-pam.git synced 2025-02-26 21:54:15 +01:00

Merge branch 'pr-200'

This commit is contained in:
Klas Lindfors 2019-09-24 10:15:36 +02:00
commit 3d71fce7ba
No known key found for this signature in database
GPG Key ID: BCA00FD4B2168C0A

View File

@ -436,7 +436,7 @@ authorize_user_token_ldap (struct cfg *cfg,
{ {
retval = AUTH_NOT_FOUND; retval = AUTH_NOT_FOUND;
} }
if(token_id && !strncmp (token_id, vals[i]->bv_val + yubi_attr_prefix_len, strlen (vals[i]->bv_val + yubi_attr_prefix_len))) if(token_id && !strncmp(token_id, vals[i]->bv_val + yubi_attr_prefix_len, cfg->token_id_length))
{ {
DBG ("Token found :: %s", vals[i]->bv_val); DBG ("Token found :: %s", vals[i]->bv_val);
retval = AUTH_FOUND; retval = AUTH_FOUND;
@ -493,7 +493,7 @@ display_error(pam_handle_t *pamh, const char *message, struct cfg *cfg) {
msg[0].msg = (char *) message; /* on some systems, pam_message.msg isn't const */ msg[0].msg = (char *) message; /* on some systems, pam_message.msg isn't const */
msg[0].msg_style = PAM_ERROR_MSG; msg[0].msg_style = PAM_ERROR_MSG;
retval = conv->conv(1, pmsg, &resp, conv->appdata_ptr); retval = conv->conv(1, pmsg, &resp, conv->appdata_ptr);
if (retval != PAM_SUCCESS) { if (retval != PAM_SUCCESS) {
DBG("conv returned error: %s", pam_strerror (pamh, retval)); DBG("conv returned error: %s", pam_strerror (pamh, retval));
return retval; return retval;