From: Darren Tucker <dtucker@dtucker.net>
Date: Sat, 4 Apr 2020 22:43:57 +0000 (+1000)
Subject: Use /usr/bin/xp4g/id if necessary.
X-Git-Tag: V_8_3_P1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a398251a4627367c78bc483c70c2ec973223f82c;p=thirdparty%2Fopenssh-portable.git

Use /usr/bin/xp4g/id if necessary.

Solaris' native "id" doesn't support the options we use but the one
in /usr/bin/xp4g does, so use that instead.
---

diff --git a/regress/percent.sh b/regress/percent.sh
index a09f16124..566700ea4 100644
--- a/regress/percent.sh
+++ b/regress/percent.sh
@@ -3,6 +3,11 @@
 
 tid="percent expansions"
 
+if [ -x "/usr/xpg4/bin/id" ]; then
+	PATH=/usr/xpg4/bin:$PATH
+	export PATH
+fi
+
 USER=`id -u -n`
 USERID=`id -u`
 HOST=`hostname | cut -f1 -d.`