d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a strict aliasing issue. Also remove an unnecessary pam_get_item()

Browse Source 
call (pam_get_authtok() will return the previous token if try_first_pass
or use_first_pass is specified).  Incidentally fix an ugly bug where the
buffer holding the prompt was freed immediately before use, instead of
after.
This commit is contained in:
Dag-Erling Smørgrav 2003-12-11 15:51:03 +00:00
parent 4911b12cba
commit 33b7c0d94c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libpam/modules/pam_ksu/pam_ksu.c
View File

@ -54,7 +54,8 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
{
krb5_context context;
krb5_principal su_principal;
const char *user, *ruser;
const char *user;
const void *ruser;
char *su_principal_name;
long rv;
int pamret;
@ -63,7 +64,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
if (pamret != PAM_SUCCESS)
return (pamret);
PAM_LOG("Got user: %s", user);
pamret = pam_get_item(pamh, PAM_RUSER, (const void **)&ruser);
pamret = pam_get_item(pamh, PAM_RUSER, &ruser);
if (pamret != PAM_SUCCESS)
return (pamret);
PAM_LOG("Got ruser: %s", ruser);
@ -128,13 +129,10 @@ auth_krb5(pam_handle_t *pamh, krb5_context context, const char *su_principal_nam
if (prompt == NULL)
return (PAM_BUF_ERR);
pass = NULL;
(void)pam_get_item(pamh, PAM_AUTHTOK, (const void **)&pass);
pamret = pam_get_authtok(pamh, PAM_AUTHTOK, &pass, prompt);
free(prompt);
if (pass == NULL) {
pamret = pam_get_authtok(pamh, PAM_AUTHTOK, &pass, prompt);
if (pamret != PAM_SUCCESS)
return (pamret);
}
if (pamret != PAM_SUCCESS)
return (pamret);
rv = krb5_get_init_creds_password(context, &creds, su_principal,
pass, NULL, NULL, 0, NULL, &gic_opt);
if (rv != 0) {