diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-06-23 19:57:20 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-06-23 19:57:20 -0400 |
| commit | c6ba2bb28cf594f2a613b989fe7cd71d9550633a (patch) | |
| tree | 365c09829fb589f28e880eaeb81875e62f70ff86 /src/monkeysphere-ssh-proxycommand | |
| parent | 2d56609494170affe821c54eea714de08c4db9c1 (diff) | |
| parent | 9f64c356556520185325d20a8293ffa839c712bf (diff) | |
Merge commit 'jrollins/master'
Diffstat (limited to 'src/monkeysphere-ssh-proxycommand')
| -rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand index f4d4b0d..6dcb723 100755 --- a/src/monkeysphere-ssh-proxycommand +++ b/src/monkeysphere-ssh-proxycommand @@ -31,6 +31,8 @@ fi HOST="$1" PORT="$2" +MS_HOME=${MS_HOME:-"${HOME}/.config/monkeysphere"} + if [ -z "$HOST" ] ; then log "host must be specified." usage @@ -58,11 +60,12 @@ else # FIXME: this only works for default known_hosts location hostKey=$(ssh-keygen -F "$HOST") if [ "$hostKey" ] ; then - # if the check keyserver variable is NOT set to true... - if [ "$CHECK_KEYSERVER" != 'true' ] ; then - # schedule a keyserver check for host at a later time - echo "monkeysphere update-known_hosts $HOST" | at noon - fi + # do not check the keyserver + # FIXME: more nuanced checking should be done here to properly + # take into consideration hosts that join monkeysphere by + # converting an existing and known ssh key + CHECK_KEYSERVER="false" + # if the host key is not found in the known_hosts file... else # check the keyserver |