database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-13 16:22:44 +03:00
Code Activity

More cleanup of userid to be AclId rather than Oid.

Browse Source
This commit is contained in:
Bruce Momjian
2002-12-05 04:04:51 +00:00
parent caaf941070
commit 7816c7cb94
17 changed files with 101 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/utils/adt/acl.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.83 2002/11/13 00:39:47 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.84 2002/12/05 04:04:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -703,7 +703,7 @@ has_table_privilege_name(PG_FUNCTION_ARGS)
{
text *tablename = PG_GETARG_TEXT_P(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
Oid tableoid;
AclMode mode;
AclResult aclresult;
@@ -751,7 +751,7 @@ has_table_privilege_id(PG_FUNCTION_ARGS)
{
Oid tableoid = PG_GETARG_OID(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
AclMode mode;
AclResult aclresult;
@@ -913,7 +913,7 @@ has_database_privilege_name(PG_FUNCTION_ARGS)
{
text *databasename = PG_GETARG_TEXT_P(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
Oid databaseoid;
AclMode mode;
AclResult aclresult;
@@ -961,7 +961,7 @@ has_database_privilege_id(PG_FUNCTION_ARGS)
{
Oid databaseoid = PG_GETARG_OID(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
AclMode mode;
AclResult aclresult;
@@ -1116,7 +1116,7 @@ has_function_privilege_name(PG_FUNCTION_ARGS)
{
text *functionname = PG_GETARG_TEXT_P(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
Oid functionoid;
AclMode mode;
AclResult aclresult;
@@ -1164,7 +1164,7 @@ has_function_privilege_id(PG_FUNCTION_ARGS)
{
Oid functionoid = PG_GETARG_OID(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
AclMode mode;
AclResult aclresult;
@@ -1315,7 +1315,7 @@ has_language_privilege_name(PG_FUNCTION_ARGS)
{
text *languagename = PG_GETARG_TEXT_P(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
Oid languageoid;
AclMode mode;
AclResult aclresult;
@@ -1363,7 +1363,7 @@ has_language_privilege_id(PG_FUNCTION_ARGS)
{
Oid languageoid = PG_GETARG_OID(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
AclMode mode;
AclResult aclresult;
@@ -1514,7 +1514,7 @@ has_schema_privilege_name(PG_FUNCTION_ARGS)
{
text *schemaname = PG_GETARG_TEXT_P(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
Oid schemaoid;
AclMode mode;
AclResult aclresult;
@@ -1562,7 +1562,7 @@ has_schema_privilege_id(PG_FUNCTION_ARGS)
{
Oid schemaoid = PG_GETARG_OID(0);
text *priv_type_text = PG_GETARG_TEXT_P(1);
int32 usesysid;
AclId usesysid;
AclMode mode;
AclResult aclresult;

42
src/backend/utils/adt/ri_triggers.c
View File

@@ -17,7 +17,7 @@
*
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.44 2002/11/29 21:39:11 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.45 2002/12/05 04:04:43 momjian Exp $
*
* ----------
*/
@@ -171,7 +171,7 @@ RI_FKey_check(PG_FUNCTION_ARGS)
bool isnull;
int i;
int match_type;
Oid save_uid;
AclId save_uid;
save_uid = GetUserId();
@@ -546,7 +546,7 @@ ri_Check_Pk_Match(Relation pk_rel, HeapTuple old_row, Oid tgoid, int match_type,
Datum check_values[RI_MAX_NUMKEYS];
char check_nulls[RI_MAX_NUMKEYS + 1];
int i;
Oid save_uid;
AclId save_uid;
bool result;
save_uid = GetUserId();
@@ -712,7 +712,7 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS)
bool isnull;
int i;
int match_type;
Oid save_uid;
AclId save_uid;
save_uid = GetUserId();
@@ -942,7 +942,7 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS)
bool isnull;
int i;
int match_type;
Oid save_uid;
AclId save_uid;
save_uid = GetUserId();
@@ -1179,8 +1179,8 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
char del_nulls[RI_MAX_NUMKEYS + 1];
bool isnull;
int i;
Oid save_uid;
Oid fk_owner;
AclId save_uid;
AclId fk_owner;
ReferentialIntegritySnapshotOverride = true;
@@ -1387,8 +1387,8 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
bool isnull;
int i;
int j;
Oid save_uid;
Oid fk_owner;
AclId save_uid;
AclId fk_owner;
ReferentialIntegritySnapshotOverride = true;
@@ -1631,8 +1631,8 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
char del_nulls[RI_MAX_NUMKEYS + 1];
bool isnull;
int i;
Oid save_uid;
Oid fk_owner;
AclId save_uid;
AclId fk_owner;
ReferentialIntegritySnapshotOverride = true;
@@ -1854,8 +1854,8 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS)
char upd_nulls[RI_MAX_NUMKEYS + 1];
bool isnull;
int i;
Oid save_uid;
Oid fk_owner;
AclId save_uid;
AclId fk_owner;
ReferentialIntegritySnapshotOverride = true;
@@ -2082,8 +2082,8 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
char upd_nulls[RI_MAX_NUMKEYS + 1];
bool isnull;
int i;
Oid save_uid;
Oid fk_owner;
AclId save_uid;
AclId fk_owner;
ReferentialIntegritySnapshotOverride = true;
@@ -2301,8 +2301,8 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
int i;
int match_type;
bool use_cached_query;
Oid save_uid;
Oid fk_owner;
AclId save_uid;
AclId fk_owner;
ReferentialIntegritySnapshotOverride = true;
@@ -2566,8 +2566,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
char upd_nulls[RI_MAX_NUMKEYS + 1];
bool isnull;
int i;
Oid save_uid;
Oid fk_owner;
AclId save_uid;
AclId fk_owner;
ReferentialIntegritySnapshotOverride = true;
@@ -2828,8 +2828,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
bool isnull;
int i;
int match_type;
Oid save_uid;
Oid fk_owner;
AclId save_uid;
AclId fk_owner;
ReferentialIntegritySnapshotOverride = true;

5
src/backend/utils/cache/lsyscache.c vendored
View File

@@ -7,13 +7,14 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.87 2002/12/01 21:05:14 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.88 2002/12/05 04:04:44 momjian Exp $
*
* NOTES
* Eventually, the index information should go through here, too.
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "miscadmin.h"
#include "access/tupmacs.h"
#include "catalog/pg_amop.h"
@@ -1529,7 +1530,7 @@ get_namespace_name(Oid nspid)
* someday. It'd be reasonable to return zero on failure if we were
* using Oid ...
*/
int32
AclId
get_usesysid(const char *username)
{
int32 result;

6
src/backend/utils/fmgr/fmgr.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.66 2002/11/13 00:39:47 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.67 2002/12/05 04:04:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -633,7 +633,7 @@ fmgr_oldstyle(PG_FUNCTION_ARGS)
struct fmgr_security_definer_cache
{
FmgrInfo flinfo;
Oid userid;
AclId userid;
};
/*
@@ -650,7 +650,7 @@ fmgr_security_definer(PG_FUNCTION_ARGS)
Datum result;
FmgrInfo *save_flinfo;
struct fmgr_security_definer_cache *fcache;
Oid save_userid;
AclId save_userid;
HeapTuple tuple;
if (!fcinfo->flinfo->fn_extra)

36
src/backend/utils/init/miscinit.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.97 2002/11/08 20:23:57 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.98 2002/12/05 04:04:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -484,27 +484,27 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir)
* restore the current user id if you need to change it.
* ----------------------------------------------------------------
*/
static Oid AuthenticatedUserId = InvalidOid;
static Oid SessionUserId = InvalidOid;
static Oid CurrentUserId = InvalidOid;
static AclId AuthenticatedUserId = 0;
static AclId SessionUserId = 0;
static AclId CurrentUserId = 0;
static bool AuthenticatedUserIsSuperuser = false;
/*
* This function is relevant for all privilege checks.
*/
Oid
AclId
GetUserId(void)
{
AssertState(OidIsValid(CurrentUserId));
AssertState(AclIdIsValid(CurrentUserId));
return CurrentUserId;
}
void
SetUserId(Oid newid)
SetUserId(AclId newid)
{
AssertArg(OidIsValid(newid));
AssertArg(AclIdIsValid(newid));
CurrentUserId = newid;
}
@@ -512,21 +512,21 @@ SetUserId(Oid newid)
/*
* This value is only relevant for informational purposes.
*/
Oid
AclId
GetSessionUserId(void)
{
AssertState(OidIsValid(SessionUserId));
AssertState(AclIdIsValid(SessionUserId));
return SessionUserId;
}
void
SetSessionUserId(Oid newid)
SetSessionUserId(AclId newid)
{
AssertArg(OidIsValid(newid));
AssertArg(AclIdIsValid(newid));
SessionUserId = newid;
/* Current user defaults to session user. */
if (!OidIsValid(CurrentUserId))
if (!AclIdIsValid(CurrentUserId))
CurrentUserId = newid;
}
@@ -537,7 +537,7 @@ InitializeSessionUserId(const char *username)
HeapTuple userTup;
Datum datum;
bool isnull;
Oid usesysid;
AclId usesysid;
/*
* Don't do scans if we're bootstrapping, none of the system catalogs
@@ -605,10 +605,10 @@ InitializeSessionUserIdStandalone(void)
* Only a superuser may set auth ID to something other than himself.
*/
void
SetSessionAuthorization(Oid userid)
SetSessionAuthorization(AclId userid)
{
/* Must have authenticated already, else can't make permission check */
AssertState(OidIsValid(AuthenticatedUserId));
AssertState(AclIdIsValid(AuthenticatedUserId));
if (userid != AuthenticatedUserId &&
!AuthenticatedUserIsSuperuser)
@@ -623,7 +623,7 @@ SetSessionAuthorization(Oid userid)
* Get user name from user id
*/
char *
GetUserNameFromId(Oid userid)
GetUserNameFromId(AclId userid)
{
HeapTuple tuple;
char *result;
@@ -632,7 +632,7 @@ GetUserNameFromId(Oid userid)
ObjectIdGetDatum(userid),
0, 0, 0);
if (!HeapTupleIsValid(tuple))
elog(ERROR, "invalid user id %u", (unsigned) userid);
elog(ERROR, "invalid user id %d", userid);
result = pstrdup(NameStr(((Form_pg_shadow) GETSTRUCT(tuple))->usename));

8
src/backend/utils/misc/superuser.c
View File

@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.24 2002/08/09 16:45:14 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.25 2002/12/05 04:04:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,7 +39,7 @@ superuser(void)
bool
superuser_arg(Oid userid)
superuser_arg(AclId userid)
{
bool result = false;
HeapTuple utup;
@@ -49,7 +49,7 @@ superuser_arg(Oid userid)
return true;
utup = SearchSysCache(SHADOWSYSID,
ObjectIdGetDatum(userid),
Int32GetDatum(userid),
0, 0, 0);
if (HeapTupleIsValid(utup))
{
@@ -67,7 +67,7 @@ superuser_arg(Oid userid)
bool
is_dbadmin(Oid dbid)
{
Oid dba;
AclId dba;
dba = get_database_owner(dbid);