From: djm@openbsd.org <djm@openbsd.org>
Date: Mon, 30 Jan 2017 04:54:07 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_5_P1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6956e21fb26652887475fe77ea40d2efcf25908b;p=thirdparty%2Fopenssh-portable.git

upstream commit

partially unbreak: was not specifying hostname on some
$SSH invocations

Upstream-Regress-ID: bc8a5e98e57bad0a92ef4f34ed91c1d18294e2cc
---

diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 617ac6323..b6d13ab72 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: forwarding.sh,v 1.17 2017/01/06 02:09:25 dtucker Exp $
+#	$OpenBSD: forwarding.sh,v 1.18 2017/01/30 04:54:07 djm Exp $
 #	Placed in the Public Domain.
 
 tid="local and remote forwarding"
@@ -82,7 +82,7 @@ for p in ${SSH_PROTOCOLS}; do
 		fail "connection failed with cleared local forwarding"
 	else
 		# this one should fail
-		${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
+		${SSH} -$p -F $OBJ/ssh_config -p ${base}01 somehost true \
 		     >>$TEST_REGRESS_LOGFILE 2>&1 && \
 			fail "local forwarding not cleared"
 	fi
@@ -96,7 +96,7 @@ for p in ${SSH_PROTOCOLS}; do
 		fail "connection failed with cleared remote forwarding"
 	else
 		# this one should fail
-		${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
+		${SSH} -$p -F $OBJ/ssh_config -p ${base}01 somehost true \
 		     >>$TEST_REGRESS_LOGFILE 2>&1 && \
 			fail "remote forwarding not cleared"
 	fi