[openssh-commits] [openssh] 06/07: upstream: Use ~/.shosts for Hostbased test.

git+noreply at mindrot.org git+noreply at mindrot.org
Mon Mar 30 18:51:37 AEDT 2026


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 55fc7bfd1d3a46f4856fd68f09da60d901fac626
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Tue Mar 24 12:31:35 2026 +0000

    upstream: Use ~/.shosts for Hostbased test.
    
    OpenBSD-Regress-ID: ab64fd0a86422df1eadacde56c0a2cff5d93425d
---
 regress/hostbased.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/regress/hostbased.sh b/regress/hostbased.sh
index 9451c5a3e..69808ceb7 100644
--- a/regress/hostbased.sh
+++ b/regress/hostbased.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: hostbased.sh,v 1.8 2026/03/24 10:21:14 dtucker Exp $
+#	$OpenBSD: hostbased.sh,v 1.9 2026/03/24 12:31:35 dtucker Exp $
 #	Placed in the Public Domain.
 
 # This test requires external setup and thus is skipped unless
@@ -26,12 +26,12 @@ elif [ "${TEST_SSH_HOSTBASED_AUTH}" = "setupandrun" ]; then
 	knownhosts=`$SSH -G localhost | \
 	    awk '$1=="globalknownhostsfile" {print $2}'`
 	sshconf=`dirname $knownhosts`
-	hostname | $SUDO tee $sshconf/shosts.equiv >/dev/null
+	hostname >~/.shosts
 	if ! grep "^EnableSSHKeysign yes" $sshconf/ssh_config >/dev/null; then
 		echo "EnableSSHKeysign yes" | \
 		    $SUDO tee -a $sshconf/ssh_config >/dev/null
 	fi
-	touch "$knownhosts"
+	$SUDO touch "$knownhosts"
 	for pubkey in $sshconf/ssh_host*key*.pub; do
 		line="`hostname` `cat $pubkey`"
 		if ! grep "$line" "$knownhosts" >/dev/null; then
@@ -47,6 +47,7 @@ cat >>$OBJ/sshd_proxy <<EOD
 HostbasedAuthentication yes
 HostbasedAcceptedAlgorithms $hostkeyalgos
 HostbasedUsesNameFromPacketOnly yes
+IgnoreRhosts no
 HostKeyAlgorithms $hostkeyalgos
 EOD
 

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list