diff options
Diffstat (limited to 'regress/reexec.sh')
-rw-r--r-- | regress/reexec.sh | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/regress/reexec.sh b/regress/reexec.sh index 72957d4cd..2192456cd 100644 --- a/regress/reexec.sh +++ b/regress/reexec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: reexec.sh,v 1.10 2016/12/16 01:06:27 dtucker Exp $ | 1 | # $OpenBSD: reexec.sh,v 1.12 2017/08/07 03:52:55 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="reexec tests" | 4 | tid="reexec tests" |
@@ -19,16 +19,13 @@ start_sshd_copy () | |||
19 | copy_tests () | 19 | copy_tests () |
20 | { | 20 | { |
21 | rm -f ${COPY} | 21 | rm -f ${COPY} |
22 | for p in ${SSH_PROTOCOLS} ; do | 22 | ${SSH} -nq -F $OBJ/ssh_config somehost \ |
23 | verbose "$tid: proto $p" | 23 | cat ${DATA} > ${COPY} |
24 | ${SSH} -nqo "Protocol=$p" -F $OBJ/ssh_config somehost \ | 24 | if [ $? -ne 0 ]; then |
25 | cat ${DATA} > ${COPY} | 25 | fail "ssh cat $DATA failed" |
26 | if [ $? -ne 0 ]; then | 26 | fi |
27 | fail "ssh cat $DATA failed" | 27 | cmp ${DATA} ${COPY} || fail "corrupted copy" |
28 | fi | 28 | rm -f ${COPY} |
29 | cmp ${DATA} ${COPY} || fail "corrupted copy" | ||
30 | rm -f ${COPY} | ||
31 | done | ||
32 | } | 29 | } |
33 | 30 | ||
34 | verbose "test config passing" | 31 | verbose "test config passing" |
@@ -54,17 +51,4 @@ rm -f $SSHD_COPY | |||
54 | copy_tests | 51 | copy_tests |
55 | 52 | ||
56 | stop_sshd | 53 | stop_sshd |
57 | |||
58 | verbose "test reexec fallback without privsep" | ||
59 | |||
60 | cp $OBJ/sshd_config.orig $OBJ/sshd_config | ||
61 | echo "UsePrivilegeSeparation=no" >> $OBJ/sshd_config | ||
62 | |||
63 | start_sshd_copy | ||
64 | rm -f $SSHD_COPY | ||
65 | |||
66 | copy_tests | ||
67 | |||
68 | stop_sshd | ||
69 | |||
70 | fi | 54 | fi |