]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Add a connection test for proxycommand. This would have
authordtucker@openbsd.org <dtucker@openbsd.org>
Fri, 24 Jan 2020 10:08:17 +0000 (10:08 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Sat, 25 Jan 2020 00:50:34 +0000 (11:50 +1100)
caught the problem caused by ssh.c rev 1.507 wherein Host and Hostname were
swapped.  Prompted by beck@

OpenBSD-Regress-ID: d218500ae6aca4c479c27318fb5b09ebc00f7aae

regress/connect.sh

index 1b344b6034e98857427987f3aa0cc18c71013fa9..5e492b86d024fb3d0dd1c002cfb7eca995223588 100644 (file)
@@ -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