diff options
| author | Micah Anderson <micah@riseup.net> | 2008-09-03 15:28:30 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2008-09-03 15:28:30 -0400 |
| commit | 86f97d40d6fb60f7dde3c7e3a8aab0124f151d35 (patch) | |
| tree | 94f62ff48a5ad9e4e65deec7b2fe606f2190555b /src/monkeysphere-ssh-proxycommand | |
| parent | 1e26301ec4cd2afc45c968c3fe3d77bf296b03fb (diff) | |
| parent | 52d692d728d7d56ec0f17e0a9afbb6579a7eece9 (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'src/monkeysphere-ssh-proxycommand')
| -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..a7b87ca 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 +# intentionally different than that of running monkeyesphere normally, +# and keyserver checking is intentionally done under certain +# circumstances. This can be overridden by setting the +# MONKEYSPHERE_CHECK_KEYSERVER environment variable. + # 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 |