From 46f856156f98208335a5287d079c19f5820118b9 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 17 Apr 2026 15:46:19 +0200
Subject: [PATCH] tests: reinstate logname error verification

* tests/misc/user.sh: Modify the "unshare -U logname" test, so that it
does not fail on glibc versions (< 2.28, >= 2.38) that do a fallback
lookup based on the tty.
---
 tests/misc/user.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/misc/user.sh b/tests/misc/user.sh
index 8385d1058..931287e41 100755
--- a/tests/misc/user.sh
+++ b/tests/misc/user.sh
@@ -25,8 +25,9 @@ overflow_uid=$(cat /proc/sys/kernel/overflowuid) ||
 
 test "$(unshare -U whoami)" = "$(id -un $overflow_uid)" || fail=1
 
-# FIXME: Fails with Manjaro Linux
-#returns_ 1 unshare -U logname 2>err || fail=1
-#test "$(cat err)" = "logname: no login name" || fail=1
+# The "</dev/null" disables a fallback lookup via utmp/utmpx,
+# that existed in glibc < 2.28 and exists again in glibc >= 2.38.
+returns_ 1 unshare -U logname </dev/null 2>err || fail=1
+test "$(cat err)" = "logname: no login name" || fail=1
 
 Exit $fail