diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-06-16 20:00:46 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-06-16 20:00:46 -0400 |
| commit | e619b23879fde5703da435141754324dcf7cfa53 (patch) | |
| tree | b469466288dbc7d2aa663c691bcf4095a5b65b53 /src/monkeysphere-ssh-proxycommand | |
| parent | 114c8d24c679e2a2339700395bc32929c3b4dcba (diff) | |
| parent | deb41134ca527508253244cfa8860a2031034825 (diff) | |
Merge branch 'master' into no-cache
Conflicts:
src/common
src/monkeysphere
src/monkeysphere-ssh-proxycommand
Diffstat (limited to 'src/monkeysphere-ssh-proxycommand')
| -rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand index ec162ab..4b90a0d 100755 --- 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") -# 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 +export CHECK_KEYSERVER # update the known_hosts file for the host monkeysphere update-known-hosts "$HOST" |