From b2bf2d17cd6eb5edcb69d51867b7d17e60751986 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 31 Jan 2009 22:32:51 -0500 Subject: some more fixes and tweaks to get things working in the new setup --- src/subcommands/m/ssh_proxycommand | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'src/subcommands/m/ssh_proxycommand') diff --git a/src/subcommands/m/ssh_proxycommand b/src/subcommands/m/ssh_proxycommand index 56a266e..7239c7a 100644 --- a/src/subcommands/m/ssh_proxycommand +++ b/src/subcommands/m/ssh_proxycommand @@ -15,27 +15,10 @@ # established. Can be added to ~/.ssh/config as follows: # ProxyCommand monkeysphere-ssh-proxycommand %h %p -######################################################################## -PGRM=$(basename $0) - -SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"} -export SYSSHAREDIR -. "${SYSSHAREDIR}/common" || exit 1 - -######################################################################## -# FUNCTIONS -######################################################################## - -usage() { - cat <&2 -usage: ssh -o ProxyCommand="$(basename $0) %h %p" ... -EOF -} - -log() { - echo "$@" >&2 -} +ssh_proxycommand() { +# "marginal case" ouput in the case that there is not a full +# validation path to the host output_no_valid_key() { local sshKeyOffered local userID @@ -250,3 +233,5 @@ if [ -z "$NO_CONNECT" ] ; then exit 255 fi fi + +} -- cgit v1.2.3