jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

Fix pam_ssh_agent_auth after rebase (#1251777)

Browse Source
This commit is contained in:
Jakub Jelen 2015-08-11 17:57:59 +02:00
parent 1d50678457
commit 405790ef61
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pam_ssh_agent_auth-0.9.3-agent_structure.patch
View File

@ -9,7 +9,7 @@ diff -up openssh-6.8p1/pam_ssh_agent_auth-0.9.3/iterate_ssh_agent_keys.c.psaa-ag
#include "ssh.h" #include "ssh.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@@ -177,34 +178,40 @@ int @@ -177,34 +178,41 @@ int
find_authorized_keys(uid_t uid) find_authorized_keys(uid_t uid)
{ {
Identity *id; Identity *id;
@ -31,7 +31,7 @@ diff -up openssh-6.8p1/pam_ssh_agent_auth-0.9.3/iterate_ssh_agent_keys.c.psaa-ag
+ if (r != SSH_ERR_AGENT_NO_IDENTITIES) + if (r != SSH_ERR_AGENT_NO_IDENTITIES)
+ fprintf(stderr, "error fetching identities for " + fprintf(stderr, "error fetching identities for "
+ "protocol %d: %s\n", 2, ssh_err(r)); + "protocol %d: %s\n", 2, ssh_err(r));
+ } else + } else {
+ for (i = 0; i < idlist->nkeys; i++) + for (i = 0; i < idlist->nkeys; i++)
{ {
- if(key != NULL) { - if(key != NULL) {
@ -56,6 +56,7 @@ diff -up openssh-6.8p1/pam_ssh_agent_auth-0.9.3/iterate_ssh_agent_keys.c.psaa-ag
+ ssh_free_identitylist(idlist); + ssh_free_identitylist(idlist);
+ ssh_close_authentication_socket(ac->fd); + ssh_close_authentication_socket(ac->fd);
+ free(ac); + free(ac);
+ }
} }
else { else {
verbose("No ssh-agent could be contacted"); verbose("No ssh-agent could be contacted");