From 60e3d0b8e6899e3378fb28a8fee2168559d53217 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 10 Oct 2023 14:41:13 -0500 Subject: [PATCH] Issue #10696 - Correcting JETTY_USER test Signed-off-by: Joakim Erdfelt --- jetty-home/src/main/resources/bin/jetty.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/jetty-home/src/main/resources/bin/jetty.sh b/jetty-home/src/main/resources/bin/jetty.sh index f8324abd20d1..9fd13d02816e 100755 --- a/jetty-home/src/main/resources/bin/jetty.sh +++ b/jetty-home/src/main/resources/bin/jetty.sh @@ -225,16 +225,14 @@ testFileSystemPermissions() fi # Don't test if JETTY_USER is specified - # as the Jetty process will switch to a different - # user id on startup - if [ -z "$JETTY_USER"] ; then + # as the Jetty process will switch to a different user id on startup + if [ -n "$JETTY_USER"] ; then (( DEBUG )) && echo "Not testing file system permissions: JETTY_USER=$JETTY_USER" return 0 fi # Don't test if setuid is specified - # as the Jetty process will switch to a different - # user id on startup + # as the Jetty process will switch to a different user id on startup if expr "${JETTY_ARGS[*]}" : '.*setuid.*' >/dev/null then (( DEBUG )) && echo "Not testing file system permissions: setuid in use"