Commite94fffc

committed

This patch improves the destroyuser script's behaviour in checking whether

the user is allowed to detroy users. It also allows for a possible incorrectempty reply to a yes/no question.Oliver Elphick

1 parentf45ec44 commite94fffcCopy full SHA for e94fffc

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`#`
`10`	`10`	`# IDENTIFICATION`
`11`		`-# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.10 1998/09/01 15:57:00 thomas Exp $`
	`11`	`+# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.11 1999/03/14 16:00:55 momjian Exp $`
`12`	`12`	`#`
`13`	`13`	`# Note - this should NOT be setuid.`
`14`	`14`	`#`
`@@ -79,9 +79,10 @@ then`
`79`	`79`	`exit 1`
`80`	`80`	`fi`
`81`	`81`
`82`		`-if [$ADDUSER!="t" ]`
	`82`	`+if [x$ADDUSER!=xt ]`
`83`	`83`	`then`
`84`	`84`	`echo"$CMDNAME:$USER cannot delete users."`
	`85`	`+exit 1`
`85`	`86`	`fi`
`86`	`87`
`87`	`88`	`#`
`@@ -152,7 +153,7 @@ then`
`152`	`153`	`#`
`153`	`154`
`154`	`155`	`yn=f`
`155`		`-while [$yn!= y-a$yn!= n ]`
	`156`	`+while ["$yn"!= y-a"$yn"!= n ]`
`156`	`157`	`do`
`157`	`158`	`echo PG_OPT_DASH_N_PARAM"Deleting user$DELUSER will destroy them. Continue (y/n)? PG_OPT_BACKSLASH_C_PARAM"`
`158`	`159`	`read yn`

Comments

(0)