In ipcclean, check LOGNAME only if USER is not set.

bmomjian · bmomjian · commit a6add72ac377 · 2006-03-03T16:49:21.000Z
Fixes problem with 'su' on some platforms.
diff --git 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.16 2006/01/05 01:56:29 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/ipcclean/ipcclean.sh,v 1.17 2006/03/03 16:49:21 momjian Exp $
 #
 
 CMDNAME=`basename $0`
@@ -19,7 +19,8 @@ if [ "$1" = '-?' -o "$1" = "--help" ]; then
     exit 0
 fi
 
-if [ "$USER" = 'root' -o "$LOGNAME" = 'root' ]
+# only check $LOGNAME if $USER is not set
+if [ "$USER" = 'root' -o \( ! "$USER" -a "$LOGNAME" = 'root' \) ]
 then
   (
     echo "$CMDNAME: cannot be run as root" 1>&2

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`	`#`
`3`		`-# $PostgreSQL: pgsql/src/bin/ipcclean/ipcclean.sh,v 1.16 2006/01/05 01:56:29 momjian Exp $`
	`3`	`+# $PostgreSQL: pgsql/src/bin/ipcclean/ipcclean.sh,v 1.17 2006/03/03 16:49:21 momjian Exp $`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	CMDNAME=`basename $0`
`@@ -19,7 +19,8 @@ if [ "$1" = '-?' -o "$1" = "--help" ]; then`
`19`	`19`	`exit 0`
`20`	`20`	`fi`
`21`	`21`
`22`		`-if [ "$USER" = 'root' -o "$LOGNAME" = 'root' ]`
	`22`	`+# only check $LOGNAME if $USER is not set`
	`23`	`+if [ "$USER" = 'root' -o \( ! "$USER" -a "$LOGNAME" = 'root' \) ]`
`23`	`24`	`then`
`24`	`25`	`(`
`25`	`26`	`echo "$CMDNAME: cannot be run as root" 1>&2`