summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/monkeysphere-ssh-proxycommand14
1 files changed, 7 insertions, 7 deletions
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
@@ -14,10 +14,6 @@
# ProxyCommand monkeysphere-ssh-proxycommand %h %p
########################################################################
-SHARE=${MONKEYSPHERE_SHARE:-"/usr/share/monkeysphere"}
-. "${SHARE}/common" || exit 1
-
-########################################################################
usage() {
cat <<EOF >&2
@@ -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