diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2017-09-26 22:39:26 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2017-09-26 22:39:26 +0000 |
| commit | b92e0e66c9af0cd29e7c90698f3dd2e0ab6af7d3 (patch) | |
| tree | a6aa161ac0feae72d66f09a6d8cc62d1d2ca8b2e /regress/usr.bin/ssh | |
| parent | 4d2283aec2e47e558459f769f576922ae3d2b52b (diff) | |
UsePrivilegeSeparation is gone, stop trying to test it.
Diffstat (limited to 'regress/usr.bin/ssh')
| -rw-r--r-- | regress/usr.bin/ssh/proxy-connect.sh | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/regress/usr.bin/ssh/proxy-connect.sh b/regress/usr.bin/ssh/proxy-connect.sh index f1b9d9f76bd..39bbd3c96e7 100644 --- a/regress/usr.bin/ssh/proxy-connect.sh +++ b/regress/usr.bin/ssh/proxy-connect.sh @@ -1,25 +1,19 @@ -# $OpenBSD: proxy-connect.sh,v 1.10 2017/04/30 23:34:55 djm Exp $ +# $OpenBSD: proxy-connect.sh,v 1.11 2017/09/26 22:39:25 dtucker Exp $ # Placed in the Public Domain. tid="proxy connect" -mv $OBJ/sshd_proxy $OBJ/sshd_proxy.orig - -for ps in no yes; do - cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy - echo "UsePrivilegeSeparation $ps" >> $OBJ/sshd_proxy - for c in no yes; do - verbose "plain username privsep=$ps comp=$c" - opts="-oCompression=$c -F $OBJ/ssh_proxy" - SSH_CONNECTION=`${SSH} $opts 999.999.999.999 'echo $SSH_CONNECTION'` - if [ $? -ne 0 ]; then - fail "ssh proxyconnect privsep=$ps comp=$c failed" - fi - if [ "$SSH_CONNECTION" != "UNKNOWN 65535 UNKNOWN 65535" ]; then - fail "bad SSH_CONNECTION privsep=$ps comp=$c: " \ - "$SSH_CONNECTION" - fi - done +for c in no yes; do + verbose "plain username comp=$c" + opts="-oCompression=$c -F $OBJ/ssh_proxy" + SSH_CONNECTION=`${SSH} $opts 999.999.999.999 'echo $SSH_CONNECTION'` + if [ $? -ne 0 ]; then + fail "ssh proxyconnect comp=$c failed" + fi + if [ "$SSH_CONNECTION" != "UNKNOWN 65535 UNKNOWN 65535" ]; then + fail "bad SSH_CONNECTION comp=$c: " \ + "$SSH_CONNECTION" + fi done verbose "username with style" |