diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/copy.c | 6 | ||||
| -rw-r--r-- | src/backend/commands/user.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 8c712c8737f..8265b981ebd 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -80,7 +80,7 @@ DoCopy(ParseState *pstate, const CopyStmt *stmt, { if (stmt->is_program) { - if (!is_member_of_role(GetUserId(), DEFAULT_ROLE_EXECUTE_SERVER_PROGRAM)) + if (!is_member_of_role(GetUserId(), ROLE_PG_EXECUTE_SERVER_PROGRAM)) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), errmsg("must be superuser or a member of the pg_execute_server_program role to COPY to or from an external program"), @@ -89,14 +89,14 @@ DoCopy(ParseState *pstate, const CopyStmt *stmt, } else { - if (is_from && !is_member_of_role(GetUserId(), DEFAULT_ROLE_READ_SERVER_FILES)) + if (is_from && !is_member_of_role(GetUserId(), ROLE_PG_READ_SERVER_FILES)) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), errmsg("must be superuser or a member of the pg_read_server_files role to COPY from a file"), errhint("Anyone can COPY to stdout or from stdin. " "psql's \\copy command also works for anyone."))); - if (!is_from && !is_member_of_role(GetUserId(), DEFAULT_ROLE_WRITE_SERVER_FILES)) + if (!is_from && !is_member_of_role(GetUserId(), ROLE_PG_WRITE_SERVER_FILES)) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), errmsg("must be superuser or a member of the pg_write_server_files role to COPY to a file"), diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index e91fa4c78c9..a8c5188ebcd 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -1501,10 +1501,10 @@ AddRoleMems(const char *rolename, Oid roleid, * situation-dependent member. There's no technical need for this * restriction. (One could lift it and take the further step of making * pg_database_ownercheck() equivalent to has_privs_of_role(roleid, - * DEFAULT_ROLE_DATABASE_OWNER), in which case explicit, + * ROLE_DATABASE_OWNER), in which case explicit, * situation-independent members could act as the owner of any database.) */ - if (roleid == DEFAULT_ROLE_DATABASE_OWNER) + if (roleid == ROLE_DATABASE_OWNER) ereport(ERROR, errmsg("role \"%s\" cannot have explicit members", rolename)); @@ -1555,7 +1555,7 @@ AddRoleMems(const char *rolename, Oid roleid, * shared object. (The effect of such ownership is that any owner of * another database can act as the owner of affected shared objects.) */ - if (memberid == DEFAULT_ROLE_DATABASE_OWNER) + if (memberid == ROLE_DATABASE_OWNER) ereport(ERROR, errmsg("role \"%s\" cannot be a member of any role", get_rolespec_name(memberRole))); |