use socat if netcat is not available from monkeysphere-ssh-proxycommand. Recommend...

diff --git a/debian/control b/debian/control
index 1b6b7b5a6c85748dd7a9a315fec39b7053699eec..3b2d5d00259a4023a81c79cab8d96a7490bb9010 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Dm-Upload-Allowed: yes
 Package: monkeysphere
 Architecture: any
 Depends: openssh-client, gnupg | gnupg2, coreutils (>= 6), moreutils, lockfile-progs, adduser, ${shlibs:Depends}
-Recommends: netcat
+Recommends: netcat | socat
 Enhances: openssh-client, openssh-server
 Description: use the OpenPGP web of trust to verify ssh connections
  SSH key-based authentication is tried-and-true, but it lacks a true

diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index 9ee205a8ffc760bccf313c2ed59f7af3671174de..438db87e993f30a2afa07a849731235cc9aae599 100755 (executable)
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -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