diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-07-29 09:50:33 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-07-29 09:50:33 -0400 |
| commit | a354378a45cfd1afb9efa63647df244651fad2af (patch) | |
| tree | 79f3c8a078ce0b53f2c2e97f30ea34c400ba24c8 | |
| parent | e90c5fcfae6bcc22058003f7d028fdb9ce84accb (diff) | |
use socat if netcat is not available from monkeysphere-ssh-proxycommand. Recommend: netcat | socat instead of just netcat.
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 1b6b7b5..3b2d5d0 100644 --- 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 9ee205a..438db87 100755 --- 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 |