diff options
| author | des <des@FreeBSD.org> | 2005-09-26 20:33:53 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-09-26 20:33:53 +0000 |
| commit | 343777dab2dd308db805e5ca5a91ab346ee37b59 (patch) | |
| tree | d06245bc3cf3062cfbf18a4a4c81d5b72f1cd84f /lib/libpam | |
| parent | 87620dae7558e911f0092874fdc8fd90e4ff933a (diff) | |
| download | FreeBSD-src-343777dab2dd308db805e5ca5a91ab346ee37b59.zip FreeBSD-src-343777dab2dd308db805e5ca5a91ab346ee37b59.tar.gz | |
Correct the logic for determining whether the user has already entered
a password. Also, work around some harmless type pun warnings.
MFC after: 3 days
Diffstat (limited to 'lib/libpam')
| -rw-r--r-- | lib/libpam/modules/pam_ssh/pam_ssh.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c index 24bd7f4..11ebfe8 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.c +++ b/lib/libpam/modules/pam_ssh/pam_ssh.c @@ -134,6 +134,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc __unused, const char *argv[] __unused) { const char **kfn, *passphrase, *user; + const void *item; struct passwd *pwd; struct pam_ssh_key *psk; int nkeys, nullok, pam_err, pass; @@ -154,8 +155,8 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, return (PAM_AUTH_ERR); nkeys = 0; - pass = (pam_get_item(pamh, PAM_AUTHTOK, - (const void **)&passphrase) == PAM_SUCCESS); + pass = (pam_get_item(pamh, PAM_AUTHTOK, &item) == PAM_SUCCESS && + item != NULL); load_keys: /* get passphrase */ pam_err = pam_get_authtok(pamh, PAM_AUTHTOK, @@ -306,6 +307,7 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh) AuthenticationConnection *ac; struct pam_ssh_key *psk; const char **kfn; + void *item; char **envlist, **env; int pam_err; @@ -324,8 +326,9 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh) /* look for keys to add to it */ for (kfn = pam_ssh_keyfiles; *kfn != NULL; ++kfn) { - pam_err = pam_get_data(pamh, *kfn, (void **)&psk); - if (pam_err == PAM_SUCCESS && psk != NULL) { + pam_err = pam_get_data(pamh, *kfn, &item); + if (pam_err == PAM_SUCCESS && item != NULL) { + psk = item; if (ssh_add_identity(ac, psk->key, psk->comment)) openpam_log(PAM_LOG_DEBUG, "added %s to ssh agent", psk->comment); |
