projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'jrollins/master'
[monkeysphere.git]
/
src
/
monkeysphere-ssh-proxycommand
diff --git
a/src/monkeysphere-ssh-proxycommand
b/src/monkeysphere-ssh-proxycommand
index ec162ab8c62985d92bf82eb0e8a0eccb120abc6b..4b90a0d21fe5e884335a43e277c96473d760c45c 100755
(executable)
--- a/
src/monkeysphere-ssh-proxycommand
+++ b/
src/monkeysphere-ssh-proxycommand
@@
-40,11
+40,14
@@
fi
# check for the host key in the known_hosts file
hostKey=$(ssh-keygen -F "$HOST")
# check for the host key in the known_hosts file
hostKey=$(ssh-keygen -F "$HOST")
-# if the host key is not found in the known_hosts file,
-# check the keyserver
-if [ -z "$hostKey" ] ; then
+# if the host key is found in the known_hosts file,
+# don't check the keyserver
+if [ "$hostKey" ] ; then
+ CHECK_KEYSERVER="false"
+else
CHECK_KEYSERVER="true"
fi
CHECK_KEYSERVER="true"
fi
+export CHECK_KEYSERVER
# update the known_hosts file for the host
monkeysphere update-known-hosts "$HOST"
# update the known_hosts file for the host
monkeysphere update-known-hosts "$HOST"