summaryrefslogtreecommitdiff
path: root/regress/proto-mismatch.sh
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2015-03-03 22:35:19 +0000
committerDamien Miller <djm@mindrot.org>2015-03-05 05:59:47 +1100
commitdad2b1892b4c1b7e58df483a8c5b983c4454e099 (patch)
treefa461e273ef92414c934a88cc88b2875032e616f /regress/proto-mismatch.sh
parentd48a22601bdd3eec054794c535f4ae8d8ae4c6e2 (diff)
downloadopenssh-git-dad2b1892b4c1b7e58df483a8c5b983c4454e099.tar.gz
upstream commit
make it possible to run tests w/o ssh1 support; ok djm@
Diffstat (limited to 'regress/proto-mismatch.sh')
-rw-r--r--regress/proto-mismatch.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/regress/proto-mismatch.sh b/regress/proto-mismatch.sh
index fb521f21..9e8024be 100644
--- a/regress/proto-mismatch.sh
+++ b/regress/proto-mismatch.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: proto-mismatch.sh,v 1.3 2002/03/15 13:08:56 markus Exp $
+# $OpenBSD: proto-mismatch.sh,v 1.4 2015/03/03 22:35:19 markus Exp $
# Placed in the Public Domain.
tid="protocol version mismatch"
@@ -16,4 +16,6 @@ mismatch ()
}
mismatch 2 SSH-1.5-HALLO
-mismatch 1 SSH-2.0-HALLO
+if ssh_version 1; then
+ mismatch 1 SSH-2.0-HALLO
+fi