nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
at 20.03 29 lines 953 B view raw
1diff --git a/pathnames.h b/pathnames.h 2index cb44caa4..354fdf05 100644 3--- a/pathnames.h 4+++ b/pathnames.h 5@@ -124,7 +124,7 @@ 6 7 /* Location of ssh-keysign for hostbased authentication */ 8 #ifndef _PATH_SSH_KEY_SIGN 9-#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign" 10+#define _PATH_SSH_KEY_SIGN "ssh-keysign" 11 #endif 12 13 /* Location of ssh-pkcs11-helper to support keys in tokens */ 14diff --git a/sshconnect2.c b/sshconnect2.c 15index dffee90b..e9a86e59 100644 16--- a/sshconnect2.c 17+++ b/sshconnect2.c 18@@ -1879,7 +1879,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp, 19 closefrom(sock + 1); 20 debug3("%s: [child] pid=%ld, exec %s", 21 __func__, (long)getpid(), _PATH_SSH_KEY_SIGN); 22- execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL); 23+ execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL); 24 fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN, 25 strerror(errno)); 26 } 27-- 282.22.0 29