summaryrefslogtreecommitdiff
path: root/src/share/m/ssh_proxycommand
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-07-24 15:20:58 -0400
committerJameson Graef Rollins <jrollins@finestructure.net>2009-07-24 15:20:58 -0400
commite3fe7faea819ac499ff851539f9af86959741c3a (patch)
tree13c4808d429b3402d6cca46082e614544c657b00 /src/share/m/ssh_proxycommand
parent478dfc8331177d7397a8430e5d04bffcd601ab2b (diff)
parentee5e8c8c627a9175a142f2a6381bbd50b7810d49 (diff)
Merge commit 'dkg/master'
Diffstat (limited to 'src/share/m/ssh_proxycommand')
-rw-r--r--src/share/m/ssh_proxycommand3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand
index 33bd8a1..96326da 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