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 /src | |
parent | e90c5fcfae6bcc22058003f7d028fdb9ce84accb (diff) |
use socat if netcat is not available from monkeysphere-ssh-proxycommand. Recommend: netcat | socat instead of just netcat.
Diffstat (limited to 'src')
-rwxr-xr-x | src/monkeysphere-ssh-proxycommand | 9 |
1 files changed, 8 insertions, 1 deletions
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 |