Put createuser ENCRYPTED/UNENCRYPTED in the proper place in the query.

bmomjian · bmomjian · commit 5863d541ae93 · 2001-08-26T03:46:58.000Z
diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser
@@ -9,7 +9,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.18 2001/08/25 17:46:11 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.19 2001/08/26 03:46:58 momjian Exp $
 #
 # Note - this should NOT be setuid.
 #
@@ -226,15 +226,15 @@ QUERY="CREATE USER \"$NewUser\""
 
 SUBQUERY=
 [ "$SysID" ] &&    SUBQUERY="$SUBQUERY SYSID $SysID"
-[ "$Password" ] && SUBQUERY="$SUBQUERY PASSWORD '$Password'"
+[ "$Encrypted" = t ] &&   SUBQUERY="$SUBQUERY ENCRYPTED"
+[ "$Encrypted" = f ] &&   SUBQUERY="$SUBQUERY UNENCRYPTED"
+[ "$Password" ] &&        SUBQUERY="$SUBQUERY PASSWORD '$Password'"
 [ "$SUBQUERY" ] &&        QUERY="$QUERY WITH $SUBQUERY"
 
 [ "$CanCreateDb" = t ] && QUERY="$QUERY CREATEDB"
 [ "$CanCreateDb" = f ] && QUERY="$QUERY NOCREATEDB"
 [ "$CanAddUser" = t ] &&  QUERY="$QUERY CREATEUSER"
 [ "$CanAddUser" = f ] &&  QUERY="$QUERY NOCREATEUSER"
-[ "$Encrypted" = t ] &&   QUERY="$QUERY ENCRYPTED"
-[ "$Encrypted" = f ] &&   QUERY="$QUERY UNENCRYPTED"
 
 ${PATHNAME}psql -c "$QUERY" -d template1 $PSQLOPT
 if [ $? -ne 0 ]; then

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#`
`10`	`10`	`#`
`11`	`11`	`# IDENTIFICATION`
`12`		`-# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.18 2001/08/25 17:46:11 momjian Exp $`
	`12`	`+# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.19 2001/08/26 03:46:58 momjian Exp $`
`13`	`13`	`#`
`14`	`14`	`# Note - this should NOT be setuid.`
`15`	`15`	`#`
`@@ -226,15 +226,15 @@ QUERY="CREATE USER \"$NewUser\""`
`226`	`226`
`227`	`227`	`SUBQUERY=`
`228`	`228`	`[ "$SysID" ] && SUBQUERY="$SUBQUERY SYSID $SysID"`
`229`		`-[ "$Password" ] && SUBQUERY="$SUBQUERY PASSWORD '$Password'"`
	`229`	`+[ "$Encrypted" = t ] && SUBQUERY="$SUBQUERY ENCRYPTED"`
	`230`	`+[ "$Encrypted" = f ] && SUBQUERY="$SUBQUERY UNENCRYPTED"`
	`231`	`+[ "$Password" ] && SUBQUERY="$SUBQUERY PASSWORD '$Password'"`
`230`	`232`	`[ "$SUBQUERY" ] && QUERY="$QUERY WITH $SUBQUERY"`
`231`	`233`
`232`	`234`	`[ "$CanCreateDb" = t ] && QUERY="$QUERY CREATEDB"`
`233`	`235`	`[ "$CanCreateDb" = f ] && QUERY="$QUERY NOCREATEDB"`
`234`	`236`	`[ "$CanAddUser" = t ] && QUERY="$QUERY CREATEUSER"`
`235`	`237`	`[ "$CanAddUser" = f ] && QUERY="$QUERY NOCREATEUSER"`
`236`		`-[ "$Encrypted" = t ] && QUERY="$QUERY ENCRYPTED"`
`237`		`-[ "$Encrypted" = f ] && QUERY="$QUERY UNENCRYPTED"`
`238`	`238`
`239`	`239`	`${PATHNAME}psql -c "$QUERY" -d template1 $PSQLOPT`
`240`	`240`	`if [ $? -ne 0 ]; then`