Replace pg_shadow and pg_group by new role-capable catalogs pg_authid

and pg_auth_members.  There are still many loose ends to finish in this
patch (no documentation, no regression tests, no pg_dump support for
instance).  But I'm going to commit it now anyway so that Alvaro can
make some progress on shared dependencies.  The catalog changes should
be pretty much done.

1 files changed, 31 insertions, 31 deletions

diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 520dc470cdc..9e965b8107f 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -14,29 +14,29 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/superuser.c,v 1.31 2005/05/29 20:38:06 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/superuser.c,v 1.32 2005/06/28 05:09:02 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "catalog/pg_shadow.h"
+#include "catalog/pg_authid.h"
 #include "utils/inval.h"
 #include "utils/syscache.h"
 #include "miscadmin.h"
 
 
 /*
- * In common cases the same userid (ie, the session or current ID) will
+ * In common cases the same roleid (ie, the session or current ID) will
  * be queried repeatedly.  So we maintain a simple one-entry cache for
- * the status of the last requested userid.  The cache can be flushed
- * at need by watching for cache update events on pg_shadow.
+ * the status of the last requested roleid.  The cache can be flushed
+ * at need by watching for cache update events on pg_authid.
  */
-static AclId	last_userid = 0;		/* 0 == cache not valid */
-static bool		last_userid_is_super = false;
-static bool		userid_callback_registered = false;
+static Oid		last_roleid = InvalidOid;	/* InvalidOid == cache not valid */
+static bool		last_roleid_is_super = false;
+static bool		roleid_callback_registered = false;
 
-static void UseridCallback(Datum arg, Oid relid);
+static void RoleidCallback(Datum arg, Oid relid);
 
 
 /*
@@ -50,49 +50,49 @@ superuser(void)
 
 
 /*
- * The specified userid has Postgres superuser privileges
+ * The specified role has Postgres superuser privileges
  */
 bool
-superuser_arg(AclId userid)
+superuser_arg(Oid roleid)
 {
 	bool		result;
-	HeapTuple	utup;
+	HeapTuple	rtup;
 
 	/* Quick out for cache hit */
-	if (AclIdIsValid(last_userid) && last_userid == userid)
-		return last_userid_is_super;
+	if (OidIsValid(last_roleid) && last_roleid == roleid)
+		return last_roleid_is_super;
 
 	/* Special escape path in case you deleted all your users. */
-	if (!IsUnderPostmaster && userid == BOOTSTRAP_USESYSID)
+	if (!IsUnderPostmaster && roleid == BOOTSTRAP_SUPERUSERID)
 		return true;
 
-	/* OK, look up the information in pg_shadow */
-	utup = SearchSysCache(SHADOWSYSID,
-						  Int32GetDatum(userid),
+	/* OK, look up the information in pg_authid */
+	rtup = SearchSysCache(AUTHOID,
+						  ObjectIdGetDatum(roleid),
 						  0, 0, 0);
-	if (HeapTupleIsValid(utup))
+	if (HeapTupleIsValid(rtup))
 	{
-		result = ((Form_pg_shadow) GETSTRUCT(utup))->usesuper;
-		ReleaseSysCache(utup);
+		result = ((Form_pg_authid) GETSTRUCT(rtup))->rolsuper;
+		ReleaseSysCache(rtup);
 	}
 	else
 	{
-		/* Report "not superuser" for invalid userids */
+		/* Report "not superuser" for invalid roleids */
 		result = false;
 	}
 
 	/* If first time through, set up callback for cache flushes */
-	if (!userid_callback_registered)
+	if (!roleid_callback_registered)
 	{
-		CacheRegisterSyscacheCallback(SHADOWSYSID,
-									  UseridCallback,
+		CacheRegisterSyscacheCallback(AUTHOID,
+									  RoleidCallback,
 									  (Datum) 0);
-		userid_callback_registered = true;
+		roleid_callback_registered = true;
 	}
 
 	/* Cache the result for next time */
-	last_userid = userid;
-	last_userid_is_super = result;
+	last_roleid = roleid;
+	last_roleid_is_super = result;
 
 	return result;
 }
@@ -102,8 +102,8 @@ superuser_arg(AclId userid)
  *		Syscache inval callback function
  */
 static void
-UseridCallback(Datum arg, Oid relid)
+RoleidCallback(Datum arg, Oid relid)
 {
-	/* Invalidate our local cache in case user's superuserness changed */
-	last_userid = 0;
+	/* Invalidate our local cache in case role's superuserness changed */
+	last_roleid = InvalidOid;
 }