From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 2 Sep 2008 23:10:39 +0000 (-0700)
Subject: some cleanup to the proxycommand.
X-Git-Tag: monkeysphere_0.12-1~4^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aefec8e2f77cf0bba2ea971607c1882925a197e2;p=monkeysphere.git

some cleanup to the proxycommand.
---

diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index cc81020..c37d754 100755
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -13,10 +13,6 @@
 # established.  Can be added to ~/.ssh/config as follows:
 #  ProxyCommand monkeysphere-ssh-proxycommand %h %p
 
-########################################################################
-SHARE=${MONKEYSPHERE_SHARE:-"/usr/share/monkeysphere"}
-. "${SHARE}/common" || exit 1
-
 ########################################################################
 
 usage() {
@@ -38,8 +34,6 @@ fi
 HOST="$1"
 PORT="$2"
 
-MS_HOME=${MS_HOME:-"${HOME}/.config/monkeysphere"}
-
 if [ -z "$HOST" ] ; then
     echo "Host not specified." >&2
     usage
@@ -57,6 +51,12 @@ else
 fi
 URI="ssh://${HOSTP}"
 
+# specify keyserver checking.  the behavior of this proxy command is
+# intentially different than that of running monkeyesphere normally,
+# and keychecking is intentially done unders certain circumstances.
+# This can be overridden by setting the MONKEYSPHERE_CHECK_KEYSERVER
+# variable on the command line.
+
 # if the host is in the gpg keyring...
 if gpg --list-key ="${URI}" 2>&1 >/dev/null ; then
     # do not check the keyserver
@@ -81,7 +81,7 @@ else
 	CHECK_KEYSERVER="true"
     fi
 fi
-
+# set and export the variable for use by monkeysphere
 MONKEYSPHERE_CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:="$CHECK_KEYSERVER"}
 export MONKEYSPHERE_CHECK_KEYSERVER