From 1639adf5465b47336075f9b51e2a58a06aecf130 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 24 Jul 2009 12:54:03 -0400 Subject: [PATCH] make sure we check for the host key existence in the correct known_hosts file. do not look for a host key in a non-existant file. (should close MS 1147) --- src/share/m/ssh_proxycommand | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand index 01ca488..c90074b 100644 --- a/src/share/m/ssh_proxycommand +++ b/src/share/m/ssh_proxycommand @@ -231,8 +231,7 @@ if gpg_user --list-key ="${URI}" &>/dev/null ; then # if the host is NOT in the keyring... else # if the host key is found in the known_hosts file... - # FIXME: this only works for default known_hosts location - hostKey=$(ssh-keygen -F "$HOST" 2>/dev/null) + hostKey=$( [ ! -r "$KNOWN_HOSTS" ] || ssh-keygen -F "$HOST" -f "$KNOWN_HOSTS" 2>/dev/null) if [ "$hostKey" ] ; then # do not check the keyserver -- 2.25.1