Skip to content

Commit

Permalink
Issue #10696 - Correcting JETTY_USER test
Browse files Browse the repository at this point in the history
Signed-off-by: Joakim Erdfelt <[email protected]>
  • Loading branch information
joakime committed Oct 10, 2023
1 parent 4e1316b commit 60e3d0b
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions jetty-home/src/main/resources/bin/jetty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 60e3d0b

Please sign in to comment.