upstream commit

remove Protocol directive from client/server configs that
causes spammy deprecation warnings

hardcode SSH_PROTOCOLS=2, since that's all we support on the server
now (the client still may support both, so it could get confused)

Upstream-Regress-ID: c16662c631af51633f9fd06aca552a70535de181

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 1b6526d0bbf3cc4c6648d3036e200badb9632ef6..7a456bbee5b6a914e9bf03ed892c7bafbc041e5a 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.53 2016/04/15 02:57:10 djm Exp $
+#      $OpenBSD: test-exec.sh,v 1.54 2016/08/23 06:36:23 djm Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -130,7 +130,8 @@ if [ "x$TEST_SSH_CONCH" != "x" ]; then
        esac
 fi
 
-SSH_PROTOCOLS=`$SSH -Q protocol-version`
+SSH_PROTOCOLS=2
+#SSH_PROTOCOLS=`$SSH -Q protocol-version`
 if [ "x$TEST_SSH_PROTOCOLS" != "x" ]; then
        SSH_PROTOCOLS="${TEST_SSH_PROTOCOLS}"
 fi
@@ -400,7 +401,6 @@ fi
 cat << EOF > $OBJ/sshd_config
        StrictModes             no
        Port                    $PORT
-       Protocol                $PROTO
        AddressFamily           inet
        ListenAddress           127.0.0.1
        #ListenAddress          ::1
@@ -433,7 +433,6 @@ echo 'StrictModes no' >> $OBJ/sshd_proxy
 # create client config
 cat << EOF > $OBJ/ssh_config
 Host *
-       Protocol                $PROTO
        Hostname                127.0.0.1
        HostKeyAlias            localhost-with-alias
        Port                    $PORT