diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-07-09 19:41:03 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-07-09 20:27:45 -0400 |
| commit | c8b42c1d77005ab3f41d20cc2524f4307086ec4f (patch) | |
| tree | da2a6afaa400993037bf4f5a5550f98803addbd0 /src/monkeysphere-ssh-proxycommand | |
| parent | e6d14b3efaa96cc55eae34556daf8f85f09b92f6 (diff) | |
A bunch of changes for variable scoping, exit codes, etc. See
debian/changelog.
Diffstat (limited to 'src/monkeysphere-ssh-proxycommand')
| -rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand index b70f3c6..6d6d3c0 100755 --- a/src/monkeysphere-ssh-proxycommand +++ b/src/monkeysphere-ssh-proxycommand @@ -53,27 +53,30 @@ URI="ssh://${HOSTP}" # if the host is in the gpg keyring... if gpg --list-key ="${URI}" 2>&1 >/dev/null ; then # do not check the keyserver - CHECK_KEYSERVER=${CHECK_KEYSERVER:-"false"} + CHECK_KEYSERVER="false" # 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") + if [ "$hostKey" ] ; then # 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=${CHECK_KEYSERVER:-"false"} + CHECK_KEYSERVER="false" # if the host key is not found in the known_hosts file... else # check the keyserver - CHECK_KEYSERVER=${CHECK_KEYSERVER:-"true"} + CHECK_KEYSERVER="true" fi fi -export CHECK_KEYSERVER + +MONKEYSPHERE_CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:="$CHECK_KEYSERVER"} +export MONKEYSPHERE_CHECK_KEYSERVER # update the known_hosts file for the host monkeysphere update-known_hosts "$HOSTP" |