From: Bruce Momjian Date: Fri, 3 Mar 2006 21:52:47 +0000 (+0000) Subject: Update ipcclean to use try 'id' first for root check. X-Git-Tag: REL8_1_4~73 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69c539b535546be59a5928f06139fe05dda86316;p=postgresql Update ipcclean to use try 'id' first for root check. --- diff --git a/src/bin/ipcclean/ipcclean.sh b/src/bin/ipcclean/ipcclean.sh index 0aff9071a7..62490dfb48 100644 --- a/src/bin/ipcclean/ipcclean.sh +++ b/src/bin/ipcclean/ipcclean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $PostgreSQL: pgsql/src/bin/ipcclean/ipcclean.sh,v 1.15.6.1 2006/03/03 16:49:30 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/ipcclean/ipcclean.sh,v 1.15.6.2 2006/03/03 21:52:47 momjian Exp $ # CMDNAME=`basename $0` @@ -19,8 +19,19 @@ if [ "$1" = '-?' -o "$1" = "--help" ]; then exit 0 fi -# only check $LOGNAME if $USER is not set -if [ "$USER" = 'root' -o \( ! "$USER" -a "$LOGNAME" = 'root' \) ] +# test for running as root + +ISROOT="N" +if id -u >/dev/null 2>&1 +then if [ `id -u` -eq 0 ] + then ISROOT="Y" + fi +elif # only check $LOGNAME if $USER is not set + [ "$USER" = 'root' -o \( ! "$USER" -a "$LOGNAME" = 'root' \) ] +then ISROOT="Y" +fi + +if [ "$ISROOT" = "Y" ] then ( echo "$CMDNAME: cannot be run as root" 1>&2