From: Alexander Barton <alex@barton.de>
Date: Sat, 13 Apr 2024 13:52:33 +0000 (+0200)
Subject: Test suite: Don't use "pgrep -u" when LOGNAME and USER are not set
X-Git-Tag: rel-27~9
X-Git-Url: https://arthur.ath.cx/gitweb/?a=commitdiff_plain;h=a33d15751b3e3910bd06125efbeae6569844f313;p=ngircd.git

Test suite: Don't use "pgrep -u" when LOGNAME and USER are not set

Thanks for reporting this on IRC, luca!
---

diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
index 85059142..3cc186e1 100755
--- a/src/testsuite/getpid.sh
+++ b/src/testsuite/getpid.sh
@@ -23,7 +23,13 @@ if [ -x /usr/bin/pgrep ]; then
 		*)
 			PGREP_FLAGS=""
 	esac
-	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
+	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
+		# Try to narrow the search down to the current user ...
+		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
+	else
+		# ... but neither LOGNAME nor USER were set!
+		exec /usr/bin/pgrep $PGREP_FLAGS -n "$1"
+	fi
 fi
 
 # pidof(1) could be a good alternative on elder Linux systems