diff options
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 41cb7af69..9a51f5690 100644 --- a/regress/connect-privsep.sh +++ b/regress/connect-privsep.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: connect-privsep.sh,v 1.5 2014/05/04 10:40:59 logan Exp $ | 1 | # $OpenBSD: connect-privsep.sh,v 1.6 2015/03/03 22:35:19 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="proxy connect with privsep" | 4 | tid="proxy connect with privsep" |
@@ -6,7 +6,7 @@ tid="proxy connect with privsep" | |||
6 | cp $OBJ/sshd_proxy $OBJ/sshd_proxy.orig | 6 | cp $OBJ/sshd_proxy $OBJ/sshd_proxy.orig |
7 | echo 'UsePrivilegeSeparation yes' >> $OBJ/sshd_proxy | 7 | echo 'UsePrivilegeSeparation yes' >> $OBJ/sshd_proxy |
8 | 8 | ||
9 | for p in 1 2; do | 9 | for p in ${SSH_PROTOCOLS}; do |
10 | ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true | 10 | ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true |
11 | if [ $? -ne 0 ]; then | 11 | if [ $? -ne 0 ]; then |
12 | fail "ssh privsep+proxyconnect protocol $p failed" | 12 | fail "ssh privsep+proxyconnect protocol $p failed" |
@@ -16,7 +16,7 @@ done | |||
16 | cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy | 16 | cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy |
17 | echo 'UsePrivilegeSeparation sandbox' >> $OBJ/sshd_proxy | 17 | echo 'UsePrivilegeSeparation sandbox' >> $OBJ/sshd_proxy |
18 | 18 | ||
19 | for p in 1 2; do | 19 | for p in ${SSH_PROTOCOLS}; do |
20 | ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true | 20 | ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true |
21 | if [ $? -ne 0 ]; then | 21 | if [ $? -ne 0 ]; then |
22 | # XXX replace this with fail once sandbox has stabilised | 22 | # XXX replace this with fail once sandbox has stabilised |
@@ -27,7 +27,7 @@ done | |||
27 | # Because sandbox is sensitive to changes in libc, especially malloc, retest | 27 | # Because sandbox is sensitive to changes in libc, especially malloc, retest |
28 | # with every malloc.conf option (and none). | 28 | # with every malloc.conf option (and none). |
29 | for m in '' A F G H J P R S X '<' '>'; do | 29 | for m in '' A F G H J P R S X '<' '>'; do |
30 | for p in 1 2; do | 30 | for p in ${SSH_PROTOCOLS}; do |
31 | env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true | 31 | env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true |
32 | if [ $? -ne 0 ]; then | 32 | if [ $? -ne 0 ]; then |
33 | fail "ssh privsep/sandbox+proxyconnect protocol $p mopt '$m' failed" | 33 | fail "ssh privsep/sandbox+proxyconnect protocol $p mopt '$m' failed" |