diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-02 19:40:35 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-02 19:40:35 -0400 |
| commit | 8deb4a20d99b928661a608cb946b40ae5ab938c7 (patch) | |
| tree | f5727d34d35179012b00cb8156a171191f737173 /src | |
| parent | 4dfcb19ae2fed99d83e3e96a1a0aeafb7d06da61 (diff) | |
| parent | aefec8e2f77cf0bba2ea971607c1882925a197e2 (diff) | |
Merge commit 'jrollins/master'
Diffstat (limited to 'src')
| -rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 14 |
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 |