From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Mon, 30 Jun 2008 13:50:57 +0000 (-0400)
Subject: Allow for passing CHECK_KEYSERVER variable to proxycommand
X-Git-Tag: monkeysphere_0.4-1~15
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=5470209cd829eda1e75719e93fe6c69cf2c1a61d;p=monkeysphere.git

Allow for passing CHECK_KEYSERVER variable to proxycommand
---

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