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/reconfigure.sh | |
parent | d48a22601bdd3eec054794c535f4ae8d8ae4c6e2 (diff) |
upstream commit
make it possible to run tests w/o ssh1 support; ok djm@
Diffstat (limited to 'regress/reconfigure.sh')
-rw-r--r-- | regress/reconfigure.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/reconfigure.sh b/regress/reconfigure.sh index e6af9eab1..eecddd3c7 100644 --- a/regress/reconfigure.sh +++ b/regress/reconfigure.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: reconfigure.sh,v 1.4 2015/01/14 09:58:21 markus Exp $ | 1 | # $OpenBSD: reconfigure.sh,v 1.5 2015/03/03 22:35:19 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="simple connect after reconfigure" | 4 | tid="simple connect after reconfigure" |
@@ -18,7 +18,7 @@ fi | |||
18 | start_sshd | 18 | start_sshd |
19 | 19 | ||
20 | trace "connect before restart" | 20 | trace "connect before restart" |
21 | for p in 1 2; do | 21 | for p in ${SSH_PROTOCOLS} ; do |
22 | ${SSH} -o "Protocol=$p" -F $OBJ/ssh_config somehost true | 22 | ${SSH} -o "Protocol=$p" -F $OBJ/ssh_config somehost true |
23 | if [ $? -ne 0 ]; then | 23 | if [ $? -ne 0 ]; then |
24 | fail "ssh connect with protocol $p failed before reconfigure" | 24 | fail "ssh connect with protocol $p failed before reconfigure" |
@@ -39,7 +39,7 @@ done | |||
39 | test -f $PIDFILE || fatal "sshd did not restart" | 39 | test -f $PIDFILE || fatal "sshd did not restart" |
40 | 40 | ||
41 | trace "connect after restart" | 41 | trace "connect after restart" |
42 | for p in 1 2; do | 42 | for p in ${SSH_PROTOCOLS} ; do |
43 | ${SSH} -o "Protocol=$p" -F $OBJ/ssh_config somehost true | 43 | ${SSH} -o "Protocol=$p" -F $OBJ/ssh_config somehost true |
44 | if [ $? -ne 0 ]; then | 44 | if [ $? -ne 0 ]; then |
45 | fail "ssh connect with protocol $p failed after reconfigure" | 45 | fail "ssh connect with protocol $p failed after reconfigure" |