Mailing List Archive

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

dtucker pushed a commit to branch master
in repository openssh.

commit 2d7964a03e1f50a48040ec6912c0a956df909d21
Author: Darren Tucker <dtucker@dtucker.net>
AuthorDate: Mon Mar 25 14:05:40 2024 +1100

Move xpg4 'id' handling into test-exec.sh.

Handle replacement of 'id' the same way as we do other Portable specific
replacements in test-exec.sh. This brings percent.sh back into sync
with upstream.
---
regress/percent.sh | 5 -----
regress/test-exec.sh | 8 ++++++++
2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/regress/percent.sh b/regress/percent.sh
index 44561d41..354854f9 100644
--- a/regress/percent.sh
+++ b/regress/percent.sh
@@ -3,11 +3,6 @@

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.`
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index ad627941..f4c363d8 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -392,6 +392,7 @@ have_prog()
jot() {
awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"
}
+
if [ ! -x "`which rev`" ]; then
rev()
{
@@ -399,6 +400,13 @@ rev()
}
fi

+if [ -x "/usr/xpg4/bin/id" ]; then
+id()
+{
+ /usr/xpg4/bin/id
+}
+fi
+
# Check whether preprocessor symbols are defined in config.h.
config_defined ()
{

--
To stop receiving notification emails like this one, please contact
djm@mindrot.org.
_______________________________________________
openssh-commits mailing list
openssh-commits@mindrot.org
https://lists.mindrot.org/mailman/listinfo/openssh-commits