diff options
| author |   djm <djm@openbsd.org> | 2016-08-23 06:36:23 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-08-23 06:36:23 +0000 |
| commit | ef8d03585eac47ba066feb173593bb4162d3d7b1 (patch) | |
| tree | c59f18c56a48ed11b2d4f255d800028e1ce6cfa1 | |
| parent | Instead of doing strcmp(argv0), track the invocation mode (pax/tar/cpio) (diff) | |
| download | wireguard-openbsd-ef8d03585eac47ba066feb173593bb4162d3d7b1.tar.xz wireguard-openbsd-ef8d03585eac47ba066feb173593bb4162d3d7b1.zip | |
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)
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index ca04b6854c2..2889e775c76 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/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. USER=`id -un` @@ -91,7 +91,8 @@ if [ "x$TEST_SSH_CONCH" != "x" ]; then CONCH="${TEST_SSH_CONCH}" 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 @@ -259,7 +260,6 @@ fi # create server config cat << EOF > $OBJ/sshd_config Port $PORT - Protocol $PROTO AddressFamily inet ListenAddress 127.0.0.1 #ListenAddress ::1 @@ -292,7 +292,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 |