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

Update for API changes in OpenSSH 6.8p1.

Browse Source 
First, the authfd API now uses a direct file descriptor for the control
socket instead of a more abstract AuthenticationConnection structure.
Second, the functions now consistently return an error value.

Reviewed by:	bdrewery
This commit is contained in:
John Baldwin 2016-01-20 00:26:50 +00:00
parent e23cd1b923
commit c560a31571
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libpam/modules/pam_ssh/pam_ssh.c
View File

@ -321,12 +321,11 @@ pam_ssh_start_agent(pam_handle_t *pamh)
static int
pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
{
AuthenticationConnection *ac;
const struct pam_ssh_key *psk;
const char **kfn;
const void *item;
char **envlist, **env;
int pam_err;
int fd, pam_err;
/* switch to PAM environment */
envlist = environ;
@ -336,7 +335,7 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
}
/* get a connection to the agent */
if ((ac = ssh_get_authentication_connection()) == NULL) {
if (ssh_get_authentication_socket(&fd) != 0) {
openpam_log(PAM_LOG_DEBUG, "failed to connect to the agent");
pam_err = PAM_SYSTEM_ERR;
goto end;
@ -347,7 +346,7 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
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))
if (ssh_add_identity(fd, psk->key, psk->comment) == 0)
openpam_log(PAM_LOG_DEBUG,
"added %s to ssh agent", psk->comment);
else
@ -358,11 +357,11 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
}
}
pam_err = PAM_SUCCESS;
end:
/* disconnect from agent */
if (ac != NULL)
ssh_close_authentication_connection(ac);
/* disconnect from agent */
ssh_close_authentication_socket(fd);
end:
/* switch back to original environment */
for (env = environ; *env != NULL; ++env)
free(*env);