From: dtucker <dtucker@openbsd.org>
Date: Fri, 5 Feb 2021 22:03:40 +0000 (+0000)
Subject: Roll back the hostname->uname change in rev 1.10.  It turns out
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4570cd644ce77ef91b08e2a0090f0720be041869;p=openbsd

Roll back the hostname->uname change in rev 1.10.  It turns out
uname -n doesn't do what we need for some platforms in portable,
so we'll fix the original problem (that some other platforms don't
have hostname at all) by providing wrapper function to implement
it.
---

diff --git a/regress/usr.bin/ssh/percent.sh b/regress/usr.bin/ssh/percent.sh
index cf0084f3a4f..f60916706c8 100644
--- a/regress/usr.bin/ssh/percent.sh
+++ b/regress/usr.bin/ssh/percent.sh
@@ -1,12 +1,12 @@
-#	$OpenBSD: percent.sh,v 1.10 2021/02/05 06:01:58 dtucker Exp $
+#	$OpenBSD: percent.sh,v 1.11 2021/02/05 22:03:40 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="percent expansions"
 
 USER=`id -u -n`
 USERID=`id -u`
-HOST=`uname -n | cut -f1 -d.`
-HOSTNAME=`uname -n`
+HOST=`hostname | cut -f1 -d.`
+HOSTNAME=`hostname`
 
 # Localcommand is evaluated after connection because %T is not available
 # until then.  Because of this we use a different method of exercising it,