diff options
author | Wout Mertens <Wout.Mertens@gmail.com> | 2020-12-16 13:11:55 +0100 |
---|---|---|
committer | Wout Mertens <Wout.Mertens@gmail.com> | 2020-12-16 13:11:55 +0100 |
commit | 2c6d008cfa0eb907106104445101f16b7099f9cb (patch) | |
tree | 39b648bcca1f34a2f27548c47ef815d24d262b54 /pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch | |
parent | f79dfa8151b5a03e25926359d59c434b3f2f2c0c (diff) | |
download | nixpkgs-2c6d008cfa0eb907106104445101f16b7099f9cb.tar nixpkgs-2c6d008cfa0eb907106104445101f16b7099f9cb.tar.gz nixpkgs-2c6d008cfa0eb907106104445101f16b7099f9cb.tar.bz2 nixpkgs-2c6d008cfa0eb907106104445101f16b7099f9cb.tar.lz nixpkgs-2c6d008cfa0eb907106104445101f16b7099f9cb.tar.xz nixpkgs-2c6d008cfa0eb907106104445101f16b7099f9cb.tar.zst nixpkgs-2c6d008cfa0eb907106104445101f16b7099f9cb.zip |
pam_ssh_agent_auth: 0.10.3 -> 0.10.4
Diffstat (limited to 'pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch')
-rw-r--r-- | pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch index 190325251c9..71d8e08ecd0 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch @@ -87,21 +87,27 @@ diff -u pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0 /* * PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter. -@@ -187,16 +184,17 @@ +@@ -184,5 +181,5 @@ */ if(user && strlen(ruser) > 0) { - pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); + pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); +@@ -201,3 +197,3 @@ + retval = PAM_SUCCESS; +- pamsshagentauth_logit("Authenticated (sshd): `%s' as `%s' using %s", ruser, user, authorized_keys_file); ++ pamsshagentauth_logit("Authenticated (sshd): `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); + +@@ -211,11 +208,12 @@ /* * this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user */ - if(pamsshagentauth_find_authorized_keys(user, ruser, servicename)) { /* getpwnam(ruser)->pw_uid)) { */ -- pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file); +- pamsshagentauth_logit("Authenticated (agent): `%s' as `%s' using %s", ruser, user, authorized_keys_file); + const char *key_file; + if((key_file = pamsshagentauth_find_authorized_keys(user, ruser, servicename))) { /* getpwnam(ruser)->pw_uid)) { */ -+ pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file); ++ pamsshagentauth_logit("Authenticated (agent): `%s' as `%s' using %s", ruser, user, key_file); retval = PAM_SUCCESS; } else { - pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); |