From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri, 24 Jan 2020 10:08:17 +0000 (+0000)
Subject: upstream: Add a connection test for proxycommand. This would have
X-Git-Tag: V_8_2_P1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2df804f571d77b07059f087b90955ffbc2f67d4;p=thirdparty%2Fopenssh-portable.git

upstream: Add a connection test for proxycommand. This would have

caught the problem caused by ssh.c rev 1.507 wherein Host and Hostname were
swapped.  Prompted by beck@

OpenBSD-Regress-ID: d218500ae6aca4c479c27318fb5b09ebc00f7aae
---

diff --git a/regress/connect.sh b/regress/connect.sh
index 1b344b603..5e492b86d 100644
--- a/regress/connect.sh
+++ b/regress/connect.sh
@@ -1,11 +1,20 @@
-#	$OpenBSD: connect.sh,v 1.6 2017/04/30 23:34:55 djm Exp $
+#	$OpenBSD: connect.sh,v 1.7 2020/01/24 10:08:17 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="simple connect"
 
+NC=nc
+
 start_sshd
 
+trace "direct connect"
 ${SSH} -F $OBJ/ssh_config somehost true
 if [ $? -ne 0 ]; then
-	fail "ssh connect with failed"
+	fail "ssh direct connect failed"
+fi
+
+trace "proxy connect"
+${SSH} -F $OBJ/ssh_config -o "proxycommand $NC %h %p" somehost true
+if [ $? -ne 0 ]; then
+	fail "ssh proxycommand connect failed"
 fi