diff options
| -rw-r--r-- | src/common | 6 | ||||
| -rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 13 |
2 files changed, 14 insertions, 5 deletions
@@ -445,6 +445,9 @@ update_known_hosts() { # least one host returnCode=0 + # set the trap to remove any lockfiles on exit + trap "lockfile-remove $KNOWN_HOSTS" EXIT + # create a lockfile on known_hosts lockfile-create "$KNOWN_HOSTS" @@ -526,6 +529,9 @@ update_authorized_keys() { # at least one user ID returnCode=0 + # set the trap to remove any lockfiles on exit + trap "lockfile-remove $AUTHORIZED_KEYS" EXIT + # create a lockfile on authorized_keys lockfile-create "$AUTHORIZED_KEYS" 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 |