projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure we check for the host key existence in the correct known_hosts file.
[monkeysphere.git]
/
src
/
share
/
m
/
ssh_proxycommand
diff --git
a/src/share/m/ssh_proxycommand
b/src/share/m/ssh_proxycommand
index 01ca488bdf6ed805d3350ea3c25470fe5a76cad4..c90074b765f403d6157779fa83096a7d4d90e803 100644
(file)
--- 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...
# 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
if [ "$hostKey" ] ; then
# do not check the keyserver