Commit fc903ee7 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Revert "Support user names in the SSH 'forward' script" 

This reverts commit 103aff1b.
parent c32cf7d9

.ssh/config

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Host gateway gateway.net.kodo.org.uk lw.kodo.org.uk 
	CheckHostIP no



Host !1-gw1.net.kodo.org.uk *.net.kodo.org.uk 10.56.*

	ProxyCommand ~/.ssh/forward %r %h %p ssh-port-user@1-gw1.net.kodo.org.uk

	ProxyCommand ~/.ssh/forward %r@%h %p ssh-port-user@1-gw1.net.kodo.org.uk

	CheckHostIP no

.ssh/forward

+3 −5
Original line number Diff line number Diff line
@@ -2,12 +2,10 @@ 
has(){ type $1 >/dev/null 2>/dev/null; }



SSH_DIR=`dirname $0`

USER=$1

HOST=$2

PORT=$3

shift 3

HOST=$1

PORT=$2



set ssh ${SSH_CONFIG:+-F "$SSH_CONFIG"} -W $USER@$HOST:$PORT "$@"

set ssh ${SSH_CONFIG:+-F "$SSH_CONFIG"} -W $1:$2 $3



for PYTHON in python3.7 python3.6 python3.5 python3.4 python3.3 python3 \

	python2.7 python2 python