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

optional.

OpenBSD-Regress-ID: 0af4fbc5168e62f89d0350de524bff1cb00e707a

1 files changed, 8 insertions, 2 deletions

diff --git a/regress/proxy-connect.sh b/regress/proxy-connect.sh
index 39bbd3c96..8847fe0c6 100644
--- a/regress/proxy-connect.sh
+++ b/regress/proxy-connect.sh
@@ -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.
 
 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"
         opts="-oCompression=$c -F $OBJ/ssh_proxy"
         SSH_CONNECTION=`${SSH} $opts 999.999.999.999 'echo $SSH_CONNECTION'`