mirror of
https://github.com/postgres/postgres.git
synced 2025-06-13 07:41:39 +03:00
Re-run pgindent, fixing a problem where comment lines after a blank
comment line where output as too long, and update typedefs for /lib directory. Also fix case where identifiers were used as variable names in the backend, but as typedefs in ecpg (favor the backend for indenting). Backpatch to 8.1.X.
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.165 2005/11/21 12:49:31 alvherre Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.166 2005/11/22 18:17:09 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -1124,15 +1124,15 @@ GrantRole(GrantRoleStmt *stmt)
|
||||
* Drop the objects owned by a given list of roles.
|
||||
*/
|
||||
void
|
||||
DropOwnedObjects(DropOwnedStmt *stmt)
|
||||
DropOwnedObjects(DropOwnedStmt * stmt)
|
||||
{
|
||||
List *role_ids = roleNamesToIds(stmt->roles);
|
||||
ListCell *cell;
|
||||
List *role_ids = roleNamesToIds(stmt->roles);
|
||||
ListCell *cell;
|
||||
|
||||
/* Check privileges */
|
||||
foreach (cell, role_ids)
|
||||
foreach(cell, role_ids)
|
||||
{
|
||||
Oid roleid = lfirst_oid(cell);
|
||||
Oid roleid = lfirst_oid(cell);
|
||||
|
||||
if (!has_privs_of_role(GetUserId(), roleid))
|
||||
ereport(ERROR,
|
||||
@ -1150,16 +1150,16 @@ DropOwnedObjects(DropOwnedStmt *stmt)
|
||||
* Give the objects owned by a given list of roles away to another user.
|
||||
*/
|
||||
void
|
||||
ReassignOwnedObjects(ReassignOwnedStmt *stmt)
|
||||
ReassignOwnedObjects(ReassignOwnedStmt * stmt)
|
||||
{
|
||||
List *role_ids = roleNamesToIds(stmt->roles);
|
||||
ListCell *cell;
|
||||
Oid newrole;
|
||||
|
||||
/* Check privileges */
|
||||
foreach (cell, role_ids)
|
||||
foreach(cell, role_ids)
|
||||
{
|
||||
Oid roleid = lfirst_oid(cell);
|
||||
Oid roleid = lfirst_oid(cell);
|
||||
|
||||
if (!has_privs_of_role(GetUserId(), roleid))
|
||||
ereport(ERROR,
|
||||
@ -1171,9 +1171,9 @@ ReassignOwnedObjects(ReassignOwnedStmt *stmt)
|
||||
newrole = get_roleid_checked(stmt->newrole);
|
||||
|
||||
if (!has_privs_of_role(GetUserId(), newrole))
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
|
||||
errmsg("permission denied to reassign objects")));
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
|
||||
errmsg("permission denied to reassign objects")));
|
||||
|
||||
/* Ok, do it */
|
||||
shdepReassignOwned(role_ids, newrole);
|
||||
|
Reference in New Issue
Block a user