mirror of
https://github.com/postgres/postgres.git
synced 2025-07-05 07:21:24 +03:00
Replace AclObjectKind with ObjectType
AclObjectKind was basically just another enumeration for object types, and we already have a preferred one for that. It's only used in aclcheck_error. By using ObjectType instead, we can also give some more precise error messages, for example "index" instead of "relation". Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
This commit is contained in:
@ -444,13 +444,13 @@ DropTableSpace(DropTableSpaceStmt *stmt)
|
||||
|
||||
/* Must be tablespace owner */
|
||||
if (!pg_tablespace_ownercheck(tablespaceoid, GetUserId()))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TABLESPACE,
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_TABLESPACE,
|
||||
tablespacename);
|
||||
|
||||
/* Disallow drop of the standard tablespaces, even by superuser */
|
||||
if (tablespaceoid == GLOBALTABLESPACE_OID ||
|
||||
tablespaceoid == DEFAULTTABLESPACE_OID)
|
||||
aclcheck_error(ACLCHECK_NO_PRIV, ACL_KIND_TABLESPACE,
|
||||
aclcheck_error(ACLCHECK_NO_PRIV, OBJECT_TABLESPACE,
|
||||
tablespacename);
|
||||
|
||||
/* DROP hook for the tablespace being removed */
|
||||
@ -941,7 +941,7 @@ RenameTableSpace(const char *oldname, const char *newname)
|
||||
|
||||
/* Must be owner */
|
||||
if (!pg_tablespace_ownercheck(HeapTupleGetOid(newtuple), GetUserId()))
|
||||
aclcheck_error(ACLCHECK_NO_PRIV, ACL_KIND_TABLESPACE, oldname);
|
||||
aclcheck_error(ACLCHECK_NO_PRIV, OBJECT_TABLESPACE, oldname);
|
||||
|
||||
/* Validate new name */
|
||||
if (!allowSystemTableMods && IsReservedName(newname))
|
||||
@ -1017,7 +1017,7 @@ AlterTableSpaceOptions(AlterTableSpaceOptionsStmt *stmt)
|
||||
|
||||
/* Must be owner of the existing object */
|
||||
if (!pg_tablespace_ownercheck(HeapTupleGetOid(tup), GetUserId()))
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TABLESPACE,
|
||||
aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_TABLESPACE,
|
||||
stmt->tablespacename);
|
||||
|
||||
/* Generate new proposed spcoptions (text array) */
|
||||
@ -1232,7 +1232,7 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source)
|
||||
if (aclresult != ACLCHECK_OK)
|
||||
{
|
||||
if (source >= PGC_S_INTERACTIVE)
|
||||
aclcheck_error(aclresult, ACL_KIND_TABLESPACE, curname);
|
||||
aclcheck_error(aclresult, OBJECT_TABLESPACE, curname);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user