X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-ssh-proxycommand;h=780ff035c78af143b7feb709250eac19dae8d163;hb=ec9ded739045d9532fbc4883bbeb37f7aa940ac6;hp=6d6d3c0f65a4ad4dfe8836952d12c7f0d437b4e4;hpb=c8b42c1d77005ab3f41d20cc2524f4307086ec4f;p=monkeysphere.git

diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index 6d6d3c0..780ff03 100755
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 
 # monkeysphere-ssh-proxycommand: MonkeySphere ssh ProxyCommand hook
 #
@@ -59,7 +59,7 @@ if gpg --list-key ="${URI}" 2>&1 >/dev/null ; then
 else
     # if the host key is found in the known_hosts file...
     # FIXME: this only works for default known_hosts location
-    hostKey=$(ssh-keygen -F "$HOST")
+    hostKey=$(ssh-keygen -F "$HOST" 2>/dev/null)
 
     if [ "$hostKey" ] ; then
 	# do not check the keyserver
@@ -83,5 +83,12 @@ monkeysphere update-known_hosts "$HOSTP"
 
 # exec a netcat passthrough to host for the ssh connection
 if [ -z "$NO_CONNECT" ] ; then
-    exec nc "$HOST" "$PORT"
+    if (which nc 2>/dev/null >/dev/null); then
+	exec nc "$HOST" "$PORT"
+    elif (which socat 2>/dev/null >/dev/null); then
+	exec socat STDIO "TCP:$HOST:$PORT"
+    else
+	log "Neither netcat nor socat found -- could not complete monkeysphere-ssh-proxycommand connection to $HOST:$PORT"
+	exit 1
+    fi
 fi