git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/ipcclean/ipcclean.sh b/src/bin/ipcclean/ipcclean.sh

index 9fc764e8a9a6fb78ec91156513d7ba3b088fe471..f55f8c7e3a44cf067408b104758040c00e8667b3 100644 (file)

--- a/src/bin/ipcclean/ipcclean.sh

+++ b/src/bin/ipcclean/ipcclean.sh

#!/bin/sh

#

-# $PostgreSQL: pgsql/src/bin/ipcclean/ipcclean.sh,v 1.17 2006年03月03日 16:49:21 momjian Exp $

+# $PostgreSQL: pgsql/src/bin/ipcclean/ipcclean.sh,v 1.18 2006年03月03日 21:52:37 momjian Exp $

#

CMDNAME=`basename 0ドル`

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