aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands/user.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2000-06-12 03:41:03 +0000
committerBruce Momjian <bruce@momjian.us>2000-06-12 03:41:03 +0000
commit3357e1d29e2d9be495510e1b2f56e8d762b91d2b (patch)
tree4b659f2bb2af581e3483f024eee344a76547f200 /src/backend/commands/user.c
parent64948dbe1599a25bc9561617d0465cc523bc59fb (diff)
downloadpostgresql-3357e1d29e2d9be495510e1b2f56e8d762b91d2b.tar.gz
postgresql-3357e1d29e2d9be495510e1b2f56e8d762b91d2b.zip
Back out pg_shadow changes to allow create table and locking permissions.
Diffstat (limited to 'src/backend/commands/user.c')
-rw-r--r--src/backend/commands/user.c39
1 files changed, 4 insertions, 35 deletions
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 512c5b4c2a3..0b46b6b97d2 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.59 2000/06/09 15:50:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.60 2000/06/12 03:40:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -250,10 +250,6 @@ CreateUser(CreateUserStmt *stmt)
return;
}
- AssertState(BoolIsValid(stmt->createtable));
- new_record[Anum_pg_shadow_usecreatetable-1] = (Datum)(stmt->createtable);
- AssertState(BoolIsValid(stmt->locktable));
- new_record[Anum_pg_shadow_uselocktable-1] = (Datum)(stmt->locktable);
/*
* Build a tuple to insert
*/
@@ -267,8 +263,6 @@ CreateUser(CreateUserStmt *stmt)
AssertState(BoolIsValid(stmt->createuser));
new_record[Anum_pg_shadow_usesuper - 1] = (Datum) (stmt->createuser);
/* superuser gets catupd right by default */
- new_record_nulls[Anum_pg_shadow_usecreatetable-1] = ' ';
- new_record_nulls[Anum_pg_shadow_uselocktable-1] = ' ';
new_record[Anum_pg_shadow_usecatupd - 1] = (Datum) (stmt->createuser);
if (stmt->password)
@@ -358,8 +352,7 @@ AlterUser(AlterUserStmt *stmt)
/* must be superuser or just want to change your own password */
if (!superuser() &&
- !(stmt->createdb==0 && stmt->createuser==0 && stmt->createtable==0
- && stmt->locktable==0 && !stmt->validUntil
+ !(stmt->createdb == 0 && stmt->createuser == 0 && !stmt->validUntil
&& stmt->password && strcmp(GetPgUserName(), stmt->user) == 0))
elog(ERROR, "ALTER USER: permission denied");
@@ -387,32 +380,8 @@ AlterUser(AlterUserStmt *stmt)
/*
* Build a tuple to update, perusing the information just obtained
*/
-
- /* createtable */
- if (stmt->createtable == 0)
- {
- /* don't change */
- new_record[Anum_pg_shadow_usecreatetable-1] = heap_getattr(tuple, Anum_pg_shadow_usecreatetable, pg_shadow_dsc, &null);
- new_record_nulls[Anum_pg_shadow_usecreatetable-1] = null ? 'n' : ' ';
- }
- else
- {
- new_record[Anum_pg_shadow_usecreatetable-1] = (Datum)(stmt->createtable > 0 ? true : false);
- new_record_nulls[Anum_pg_shadow_usecreatetable-1] = ' ';
- }
-
- /* locktable */
- if (stmt->locktable == 0)
- {
- /* don't change */
- new_record[Anum_pg_shadow_uselocktable-1] = heap_getattr(tuple, Anum_pg_shadow_uselocktable, pg_shadow_dsc, &null);
- new_record_nulls[Anum_pg_shadow_uselocktable-1] = null ? 'n' : ' ';
- }
- else
- {
- new_record[Anum_pg_shadow_uselocktable-1] = (Datum)(stmt->locktable > 0 ? true : false);
- new_record_nulls[Anum_pg_shadow_uselocktable-1] = ' ';
- }
+ new_record[Anum_pg_shadow_usename - 1] = PointerGetDatum(namein(stmt->user));
+ new_record_nulls[Anum_pg_shadow_usename - 1] = ' ';
/* sysid - leave as is */
new_record[Anum_pg_shadow_usesysid - 1] = heap_getattr(tuple, Anum_pg_shadow_usesysid, pg_shadow_dsc, &null);