diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-03-03 22:35:19 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-03-05 05:59:47 +1100 |
commit | dad2b1892b4c1b7e58df483a8c5b983c4454e099 (patch) | |
tree | fa461e273ef92414c934a88cc88b2875032e616f /regress/connect-privsep.sh | |
parent | d48a22601bdd3eec054794c535f4ae8d8ae4c6e2 (diff) | |
download | openssh-git-dad2b1892b4c1b7e58df483a8c5b983c4454e099.tar.gz |
upstream commit
make it possible to run tests w/o ssh1 support; ok djm@
Diffstat (limited to 'regress/connect-privsep.sh')
-rw-r--r-- | regress/connect-privsep.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh index 41cb7af6..9a51f569 100644 --- a/regress/connect-privsep.sh +++ b/regress/connect-privsep.sh @@ -1,4 +1,4 @@ -# $OpenBSD: connect-privsep.sh,v 1.5 2014/05/04 10:40:59 logan Exp $ +# $OpenBSD: connect-privsep.sh,v 1.6 2015/03/03 22:35:19 markus Exp $ # Placed in the Public Domain. tid="proxy connect with privsep" @@ -6,7 +6,7 @@ tid="proxy connect with privsep" cp $OBJ/sshd_proxy $OBJ/sshd_proxy.orig echo 'UsePrivilegeSeparation yes' >> $OBJ/sshd_proxy -for p in 1 2; do +for p in ${SSH_PROTOCOLS}; do ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true if [ $? -ne 0 ]; then fail "ssh privsep+proxyconnect protocol $p failed" @@ -16,7 +16,7 @@ done cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy echo 'UsePrivilegeSeparation sandbox' >> $OBJ/sshd_proxy -for p in 1 2; do +for p in ${SSH_PROTOCOLS}; do ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true if [ $? -ne 0 ]; then # XXX replace this with fail once sandbox has stabilised @@ -27,7 +27,7 @@ done # Because sandbox is sensitive to changes in libc, especially malloc, retest # with every malloc.conf option (and none). for m in '' A F G H J P R S X '<' '>'; do - for p in 1 2; do + for p in ${SSH_PROTOCOLS}; do env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true if [ $? -ne 0 ]; then fail "ssh privsep/sandbox+proxyconnect protocol $p mopt '$m' failed" |