has_table_privilege spawns scions has_database_privilege, has_function_privilege,

[postgresql] / src / backend / utils / misc / superuser.c

diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 9652b5c01aac7473226ab094bcaedb78ca447fcb..735ad7adf321b35aaa62c11878c2ddb7e1fc4a08 100644 (file)
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -10,19 +10,17 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.23 2002/06/20 20:29:40 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.24 2002/08/09 16:45:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "catalog/catname.h"
-#include "catalog/pg_database.h"
 #include "catalog/pg_shadow.h"
+#include "commands/dbcommands.h"
 #include "utils/syscache.h"
 #include "miscadmin.h"
-#include "utils/fmgroids.h"
 
 
 /*
@@ -69,25 +67,9 @@ superuser_arg(Oid userid)
 bool
 is_dbadmin(Oid dbid)
 {
-       Relation        pg_database;
-       ScanKeyData entry[1];
-       HeapScanDesc scan;
-       HeapTuple       dbtuple;
-       int32           dba;
+       Oid                     dba;
 
-       /* There's no syscache for pg_database, so must look the hard way */
-       pg_database = heap_openr(DatabaseRelationName, AccessShareLock);
-       ScanKeyEntryInitialize(&entry[0], 0x0,
-                                                  ObjectIdAttributeNumber, F_OIDEQ,
-                                                  ObjectIdGetDatum(dbid));
-       scan = heap_beginscan(pg_database, SnapshotNow, 1, entry);
-       dbtuple = heap_getnext(scan, ForwardScanDirection);
-       if (!HeapTupleIsValid(dbtuple))
-               elog(ERROR, "database %u does not exist", dbid);
-       dba = ((Form_pg_database) GETSTRUCT(dbtuple))->datdba;
-       heap_endscan(scan);
-       heap_close(pg_database, AccessShareLock);
+       dba = get_database_owner(dbid);
 
-       /* XXX some confusion about whether userids are OID or int4 ... */
-       return (GetUserId() == (Oid) dba);
+       return (GetUserId() == dba);
 }