some more fixes and tweaks to get things working in the new setup

[monkeysphere.git] / src / subcommands / m / ssh_proxycommand

diff --git a/src/subcommands/m/ssh_proxycommand b/src/subcommands/m/ssh_proxycommand
index 56a266ee14e42c21129ffa048f2c4f5fbfd1ba15..7239c7ad9d98a13fff4b84a59cda4cb77bd7c037 100644 (file)
--- 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 <<EOF >&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
+
+}