summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-30 09:50:57 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-30 09:50:57 -0400
commit5470209cd829eda1e75719e93fe6c69cf2c1a61d (patch)
tree7c282a937f606b9fb23157d59e9e1eb7d164f4e1 /src
parent14472b4712fba73c1e3a3b70fb62f33c5afe7739 (diff)
Allow for passing CHECK_KEYSERVER variable to proxycommand
Diffstat (limited to 'src')
-rwxr-xr-xsrc/monkeysphere-ssh-proxycommand6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index 15153d8..30d511a 100755
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -51,7 +51,7 @@ fi
# 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="false"
+ CHECK_KEYSERVER=${CHECK_KEYSERVER:-"false"}
# if the host is NOT in the keyring...
else
@@ -63,12 +63,12 @@ else
# 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"
+ CHECK_KEYSERVER=${CHECK_KEYSERVER:-"false"}
# if the host key is not found in the known_hosts file...
else
# check the keyserver
- CHECK_KEYSERVER="true"
+ CHECK_KEYSERVER=${CHECK_KEYSERVER:-"true"}
fi
fi
export CHECK_KEYSERVER