upstream: Handle zlib compression being disabled now that it's

optional.

OpenBSD-Regress-ID: 0af4fbc5168e62f89d0350de524bff1cb00e707a
This commit is contained in:
dtucker@openbsd.org 2020-01-23 11:19:12 +00:00 committed by Darren Tucker
parent fbce7c1a89
commit 415192348a
2 changed files with 16 additions and 4 deletions

View File

@ -1,9 +1,15 @@
# $OpenBSD: proxy-connect.sh,v 1.11 2017/09/26 22:39:25 dtucker Exp $ # $OpenBSD: proxy-connect.sh,v 1.12 2020/01/23 11:19:12 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="proxy connect" tid="proxy connect"
for c in no yes; do if [ "`${SSH} -Q compression`" = "none" ]; then
comp="no"
else
comp="no yes"
fi
for c in $comp; do
verbose "plain username comp=$c" verbose "plain username comp=$c"
opts="-oCompression=$c -F $OBJ/ssh_proxy" opts="-oCompression=$c -F $OBJ/ssh_proxy"
SSH_CONNECTION=`${SSH} $opts 999.999.999.999 'echo $SSH_CONNECTION'` SSH_CONNECTION=`${SSH} $opts 999.999.999.999 'echo $SSH_CONNECTION'`

View File

@ -1,4 +1,4 @@
# $OpenBSD: putty-transfer.sh,v 1.6 2018/02/23 03:03:00 djm Exp $ # $OpenBSD: putty-transfer.sh,v 1.7 2020/01/23 11:19:12 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="putty transfer data" tid="putty transfer data"
@ -8,7 +8,13 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
exit 0 exit 0
fi fi
for c in 0 1 ; do if [ "`${SSH} -Q compression`" = "none" ]; then
comp="0"
else
comp="0 1"
fi
for c in $comp; do
verbose "$tid: compression $c" verbose "$tid: compression $c"
rm -f ${COPY} rm -f ${COPY}
cp ${OBJ}/.putty/sessions/localhost_proxy \ cp ${OBJ}/.putty/sessions/localhost_proxy \