From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 24 Jul 2009 16:54:03 +0000 (-0400)
Subject: make sure we check for the host key existence in the correct known_hosts file.
X-Git-Tag: monkeysphere_0.26~23^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1639adf5465b47336075f9b51e2a58a06aecf130;p=monkeysphere.git

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)
---

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