diff options
| author | des <des@FreeBSD.org> | 2003-12-11 15:51:03 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-12-11 15:51:03 +0000 |
| commit | 3812c7acf52c1a6bd64f4a7ff596ce6de26351c2 (patch) | |
| tree | 67c31ae08d9d96782689b726511c3e1f7b1b9547 /lib/libpam | |
| parent | e64a27f5c07f492c4907210f9f100138cf3e3449 (diff) | |
| download | FreeBSD-src-3812c7acf52c1a6bd64f4a7ff596ce6de26351c2.zip FreeBSD-src-3812c7acf52c1a6bd64f4a7ff596ce6de26351c2.tar.gz | |
Fix a strict aliasing issue. Also remove an unnecessary pam_get_item()
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.
Diffstat (limited to 'lib/libpam')
| -rw-r--r-- | lib/libpam/modules/pam_ksu/pam_ksu.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c index a2ffe61..537e36b 100644 --- a/lib/libpam/modules/pam_ksu/pam_ksu.c +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c @@ -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) { |
