diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-08-26 03:46:58 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-08-26 03:46:58 +0000 |
| commit | 5863d541ae9380f1361d8628443d29af3aee1103 (patch) | |
| tree | 02cf753511cfe6b1c093c3cd0259e62df6619c38 /src | |
| parent | 19a251d0ec8ffb326a8c46a7c66821834dbba8d3 (diff) | |
| download | postgresql-5863d541ae9380f1361d8628443d29af3aee1103.tar.gz postgresql-5863d541ae9380f1361d8628443d29af3aee1103.zip | |
Put createuser ENCRYPTED/UNENCRYPTED in the proper place in the query.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/scripts/createuser | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser index a57531aac05..819f9d2cd9e 100644 --- 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 |