database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Remove NO_SECURITY define.

Browse Source
This commit is contained in:
Bruce Momjian
2000-10-16 17:08:11 +00:00
parent 17e3e4702d
commit 85f1950a6f
12 changed files with 24 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/commands/analyze.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.7 2000/10/05 19:48:22 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.8 2000/10/16 17:08:05 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
@ -98,7 +98,6 @@ analyze_rel(Oid relid, List *anal_cols2, int MESSAGE_LEVEL)
onerel = heap_open(relid, AccessShareLock); onerel = heap_open(relid, AccessShareLock);
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), RelationGetRelationName(onerel), if (!pg_ownercheck(GetUserId(), RelationGetRelationName(onerel),
RELNAME)) RELNAME))
{ {
@ -110,7 +109,6 @@ analyze_rel(Oid relid, List *anal_cols2, int MESSAGE_LEVEL)
CommitTransactionCommand(); CommitTransactionCommand();
return; return;
} }
#endif
elog(MESSAGE_LEVEL, "Analyzing..."); elog(MESSAGE_LEVEL, "Analyzing...");

10
src/backend/commands/command.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.106 2000/10/10 17:13:30 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.107 2000/10/16 17:08:05 momjian Exp $
* *
* NOTES * NOTES
* The PerformAddAttribute() code, like most of the relation * The PerformAddAttribute() code, like most of the relation
@ -311,10 +311,8 @@ AlterTableAddColumn(const char *relationName,
if (!allowSystemTableMods && IsSystemRelationName(relationName)) if (!allowSystemTableMods && IsSystemRelationName(relationName))
elog(ERROR, "ALTER TABLE: relation \"%s\" is a system catalog", elog(ERROR, "ALTER TABLE: relation \"%s\" is a system catalog",
relationName); relationName);
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relationName, RELNAME)) if (!pg_ownercheck(GetUserId(), relationName, RELNAME))
elog(ERROR, "ALTER TABLE: permission denied"); elog(ERROR, "ALTER TABLE: permission denied");
#endif
/* /*
* Grab an exclusive lock on the target table, which we will NOT * Grab an exclusive lock on the target table, which we will NOT
@ -1591,7 +1589,7 @@ AlterTableCreateToastTable(const char *relationName, bool silent)
if (((Form_pg_class) GETSTRUCT(reltup))->reltoastrelid != InvalidOid) if (((Form_pg_class) GETSTRUCT(reltup))->reltoastrelid != InvalidOid)
{ {
if (silent) if (silent)
{ {
heap_close(rel, NoLock); heap_close(rel, NoLock);
heap_close(class_rel, NoLock); heap_close(class_rel, NoLock);
@ -1601,14 +1599,14 @@ AlterTableCreateToastTable(const char *relationName, bool silent)
elog(ERROR, "ALTER TABLE: relation \"%s\" already has a toast table", elog(ERROR, "ALTER TABLE: relation \"%s\" already has a toast table",
relationName); relationName);
} }
/* /*
* Check to see whether the table actually needs a TOAST table. * Check to see whether the table actually needs a TOAST table.
*/ */
if (! needs_toast_table(rel)) if (! needs_toast_table(rel))
{ {
if (silent) if (silent)
{ {
heap_close(rel, NoLock); heap_close(rel, NoLock);
heap_close(class_rel, NoLock); heap_close(class_rel, NoLock);

4
src/backend/commands/comment.c
View File

@ -283,10 +283,8 @@ CommentRelation(int reltype, char *relname, char *comment)
/*** First, check object security ***/ /*** First, check object security ***/
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relname, RELNAME)) if (!pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "you are not permitted to comment on class '%s'", relname); elog(ERROR, "you are not permitted to comment on class '%s'", relname);
#endif
/*** Now, attempt to find the oid in the cached version of pg_class ***/ /*** Now, attempt to find the oid in the cached version of pg_class ***/
@ -349,10 +347,8 @@ CommentAttribute(char *relname, char *attrname, char *comment)
/*** First, check object security ***/ /*** First, check object security ***/
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relname, RELNAME)) if (!pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "you are not permitted to comment on class '%s\'", relname); elog(ERROR, "you are not permitted to comment on class '%s\'", relname);
#endif
/*** Now, fetch the attribute oid from the system cache ***/ /*** Now, fetch the attribute oid from the system cache ***/

10
src/backend/commands/remove.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.53 2000/10/07 00:58:16 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.54 2000/10/16 17:08:05 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -81,13 +81,11 @@ RemoveOperator(char *operatorName, /* operator name */
if (HeapTupleIsValid(tup)) if (HeapTupleIsValid(tup))
{ {
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), if (!pg_ownercheck(GetUserId(),
(char *) ObjectIdGetDatum(tup->t_data->t_oid), (char *) ObjectIdGetDatum(tup->t_data->t_oid),
OPEROID)) OPEROID))
elog(ERROR, "RemoveOperator: operator '%s': permission denied", elog(ERROR, "RemoveOperator: operator '%s': permission denied",
operatorName); operatorName);
#endif
/*** Delete any comments associated with this operator ***/ /*** Delete any comments associated with this operator ***/
@ -250,11 +248,9 @@ RemoveType(char *typeName) /* type name to be removed */
Oid typeOid; Oid typeOid;
char *shadow_type; char *shadow_type;
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), typeName, TYPENAME)) if (!pg_ownercheck(GetUserId(), typeName, TYPENAME))
elog(ERROR, "RemoveType: type '%s': permission denied", elog(ERROR, "RemoveType: type '%s': permission denied",
typeName); typeName);
#endif
relation = heap_openr(TypeRelationName, RowExclusiveLock); relation = heap_openr(TypeRelationName, RowExclusiveLock);
@ -334,13 +330,11 @@ RemoveFunction(char *functionName, /* function name to be removed */
} }
} }
#ifndef NO_SECURITY
if (!pg_func_ownercheck(GetUserId(), functionName, nargs, argList)) if (!pg_func_ownercheck(GetUserId(), functionName, nargs, argList))
{ {
elog(ERROR, "RemoveFunction: function '%s': permission denied", elog(ERROR, "RemoveFunction: function '%s': permission denied",
functionName); functionName);
} }
#endif
relation = heap_openr(ProcedureRelationName, RowExclusiveLock); relation = heap_openr(ProcedureRelationName, RowExclusiveLock);
tup = SearchSysCacheTuple(PROCNAME, tup = SearchSysCacheTuple(PROCNAME,
@ -396,7 +390,6 @@ RemoveAggregate(char *aggName, char *aggType)
else else
basetypeID = 0; basetypeID = 0;
#ifndef NO_SECURITY
if (!pg_aggr_ownercheck(GetUserId(), aggName, basetypeID)) if (!pg_aggr_ownercheck(GetUserId(), aggName, basetypeID))
{ {
if (aggType) if (aggType)
@ -410,7 +403,6 @@ RemoveAggregate(char *aggName, char *aggType)
aggName); aggName);
} }
} }
#endif
relation = heap_openr(AggregateRelationName, RowExclusiveLock); relation = heap_openr(AggregateRelationName, RowExclusiveLock);
tup = SearchSysCacheTuple(AGGNAME, tup = SearchSysCacheTuple(AGGNAME,

4
src/backend/commands/rename.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.48 2000/10/16 14:52:03 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.49 2000/10/16 17:08:05 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -71,12 +71,10 @@ renameatt(char *relname,
if (!allowSystemTableMods && IsSystemRelationName(relname)) if (!allowSystemTableMods && IsSystemRelationName(relname))
elog(ERROR, "renameatt: class \"%s\" is a system catalog", elog(ERROR, "renameatt: class \"%s\" is a system catalog",
relname); relname);
#ifndef NO_SECURITY
if (!IsBootstrapProcessingMode() && if (!IsBootstrapProcessingMode() &&
!pg_ownercheck(GetUserId(), relname, RELNAME)) !pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "renameatt: you do not own class \"%s\"", elog(ERROR, "renameatt: you do not own class \"%s\"",
relname); relname);
#endif
/* /*
* Grab an exclusive lock on the target table, which we will NOT * Grab an exclusive lock on the target table, which we will NOT

6
src/backend/commands/sequence.c
View File

@ -201,11 +201,9 @@ nextval(PG_FUNCTION_ARGS)
next, next,
rescnt = 0; rescnt = 0;
#ifndef NO_SECURITY
if (pg_aclcheck(seqname, GetUserId(), ACL_WR) != ACLCHECK_OK) if (pg_aclcheck(seqname, GetUserId(), ACL_WR) != ACLCHECK_OK)
elog(ERROR, "%s.nextval: you don't have permissions to set sequence %s", elog(ERROR, "%s.nextval: you don't have permissions to set sequence %s",
seqname, seqname); seqname, seqname);
#endif
/* open and AccessShareLock sequence */ /* open and AccessShareLock sequence */
elm = init_sequence("nextval", seqname); elm = init_sequence("nextval", seqname);
@ -298,11 +296,9 @@ currval(PG_FUNCTION_ARGS)
SeqTable elm; SeqTable elm;
int32 result; int32 result;
#ifndef NO_SECURITY
if (pg_aclcheck(seqname, GetUserId(), ACL_RD) != ACLCHECK_OK) if (pg_aclcheck(seqname, GetUserId(), ACL_RD) != ACLCHECK_OK)
elog(ERROR, "%s.currval: you don't have permissions to read sequence %s", elog(ERROR, "%s.currval: you don't have permissions to read sequence %s",
seqname, seqname); seqname, seqname);
#endif
/* open and AccessShareLock sequence */ /* open and AccessShareLock sequence */
elm = init_sequence("currval", seqname); elm = init_sequence("currval", seqname);
@ -325,11 +321,9 @@ do_setval(char *seqname, int32 next, bool iscalled)
Buffer buf; Buffer buf;
Form_pg_sequence seq; Form_pg_sequence seq;
#ifndef NO_SECURITY
if (pg_aclcheck(seqname, GetUserId(), ACL_WR) != ACLCHECK_OK) if (pg_aclcheck(seqname, GetUserId(), ACL_WR) != ACLCHECK_OK)
elog(ERROR, "%s.setval: you don't have permissions to set sequence %s", elog(ERROR, "%s.setval: you don't have permissions to set sequence %s",
seqname, seqname); seqname, seqname);
#endif
/* open and AccessShareLock sequence */ /* open and AccessShareLock sequence */
elm = init_sequence("setval", seqname); elm = init_sequence("setval", seqname);

6
src/backend/commands/trigger.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.77 2000/09/06 14:15:16 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.78 2000/10/16 17:08:05 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -68,10 +68,8 @@ CreateTrigger(CreateTrigStmt *stmt)
if (!allowSystemTableMods && IsSystemRelationName(stmt->relname)) if (!allowSystemTableMods && IsSystemRelationName(stmt->relname))
elog(ERROR, "CreateTrigger: can't create trigger for system relation %s", stmt->relname); elog(ERROR, "CreateTrigger: can't create trigger for system relation %s", stmt->relname);
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), stmt->relname, RELNAME)) if (!pg_ownercheck(GetUserId(), stmt->relname, RELNAME))
elog(ERROR, "%s: %s", stmt->relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]); elog(ERROR, "%s: %s", stmt->relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]);
#endif
/* ---------- /* ----------
* If trigger is a constraint, user trigger name as constraint * If trigger is a constraint, user trigger name as constraint
@ -308,10 +306,8 @@ DropTrigger(DropTrigStmt *stmt)
int found = 0; int found = 0;
int tgfound = 0; int tgfound = 0;
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), stmt->relname, RELNAME)) if (!pg_ownercheck(GetUserId(), stmt->relname, RELNAME))
elog(ERROR, "%s: %s", stmt->relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]); elog(ERROR, "%s: %s", stmt->relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]);
#endif
rel = heap_openr(stmt->relname, AccessExclusiveLock); rel = heap_openr(stmt->relname, AccessExclusiveLock);

4
src/backend/commands/vacuum.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.167 2000/10/05 19:48:22 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.168 2000/10/16 17:08:05 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
@ -397,7 +397,6 @@ vacuum_rel(Oid relid, bool analyze, bool is_toastrel)
*/ */
onerel = heap_open(relid, AccessExclusiveLock); onerel = heap_open(relid, AccessExclusiveLock);
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), RelationGetRelationName(onerel), if (!pg_ownercheck(GetUserId(), RelationGetRelationName(onerel),
RELNAME)) RELNAME))
{ {
@ -408,7 +407,6 @@ vacuum_rel(Oid relid, bool analyze, bool is_toastrel)
CommitTransactionCommand(); CommitTransactionCommand();
return; return;
} }
#endif
/* /*
* Remember the relation'ss TOAST relation for later * Remember the relation'ss TOAST relation for later

4
src/backend/executor/execMain.c
View File

@ -27,7 +27,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.129 2000/10/05 19:11:26 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.130 2000/10/16 17:08:06 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -619,9 +619,7 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
/* /*
* Do permissions checks. * Do permissions checks.
*/ */
#ifndef NO_SECURITY
ExecCheckQueryPerms(operation, parseTree, plan); ExecCheckQueryPerms(operation, parseTree, plan);
#endif
/* /*
* get information from query descriptor * get information from query descriptor

24
src/backend/tcop/utility.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.95 2000/10/07 00:58:18 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.96 2000/10/16 17:08:07 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -174,11 +174,9 @@ ProcessUtility(Node *parsetree,
relname); relname);
/* close rel, but keep lock until end of xact */ /* close rel, but keep lock until end of xact */
heap_close(rel, NoLock); heap_close(rel, NoLock);
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relname, RELNAME)) if (!pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "you do not own class \"%s\"", elog(ERROR, "you do not own class \"%s\"",
relname); relname);
#endif
} }
/* OK, terminate 'em all */ /* OK, terminate 'em all */
foreach(arg, args) foreach(arg, args)
@ -210,10 +208,8 @@ ProcessUtility(Node *parsetree,
relname); relname);
heap_close(rel, NoLock); heap_close(rel, NoLock);
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relname, RELNAME)) if (!pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "you do not own class \"%s\"", relname); elog(ERROR, "you do not own class \"%s\"", relname);
#endif
TruncateRelation(relname); TruncateRelation(relname);
} }
break; break;
@ -270,10 +266,8 @@ ProcessUtility(Node *parsetree,
if (!allowSystemTableMods && IsSystemRelationName(relname)) if (!allowSystemTableMods && IsSystemRelationName(relname))
elog(ERROR, "ALTER TABLE: relation \"%s\" is a system catalog", elog(ERROR, "ALTER TABLE: relation \"%s\" is a system catalog",
relname); relname);
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relname, RELNAME)) if (!pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "permission denied"); elog(ERROR, "permission denied");
#endif
/* ---------------- /* ----------------
* XXX using len == 3 to tell the difference * XXX using len == 3 to tell the difference
@ -430,12 +424,10 @@ ProcessUtility(Node *parsetree,
RuleStmt *stmt = (RuleStmt *) parsetree; RuleStmt *stmt = (RuleStmt *) parsetree;
int aclcheck_result; int aclcheck_result;
#ifndef NO_SECURITY
relname = stmt->object->relname; relname = stmt->object->relname;
aclcheck_result = pg_aclcheck(relname, GetUserId(), ACL_RU); aclcheck_result = pg_aclcheck(relname, GetUserId(), ACL_RU);
if (aclcheck_result != ACLCHECK_OK) if (aclcheck_result != ACLCHECK_OK)
elog(ERROR, "%s: %s", relname, aclcheck_error_strings[aclcheck_result]); elog(ERROR, "%s: %s", relname, aclcheck_error_strings[aclcheck_result]);
#endif
set_ps_display(commandTag = "CREATE"); set_ps_display(commandTag = "CREATE");
DefineQueryRewrite(stmt); DefineQueryRewrite(stmt);
@ -473,10 +465,8 @@ ProcessUtility(Node *parsetree,
if (!allowSystemTableMods && IsSystemRelationName(relname)) if (!allowSystemTableMods && IsSystemRelationName(relname))
elog(ERROR, "class \"%s\" is a system catalog index", elog(ERROR, "class \"%s\" is a system catalog index",
relname); relname);
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relname, RELNAME)) if (!pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "%s: %s", relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]); elog(ERROR, "%s: %s", relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]);
#endif
RemoveIndex(relname); RemoveIndex(relname);
break; break;
case RULE: case RULE:
@ -484,20 +474,15 @@ ProcessUtility(Node *parsetree,
char *rulename = stmt->name; char *rulename = stmt->name;
int aclcheck_result; int aclcheck_result;
#ifndef NO_SECURITY
relationName = RewriteGetRuleEventRel(rulename); relationName = RewriteGetRuleEventRel(rulename);
aclcheck_result = pg_aclcheck(relationName, GetUserId(), ACL_RU); aclcheck_result = pg_aclcheck(relationName, GetUserId(), ACL_RU);
if (aclcheck_result != ACLCHECK_OK) if (aclcheck_result != ACLCHECK_OK)
elog(ERROR, "%s: %s", relationName, aclcheck_error_strings[aclcheck_result]); elog(ERROR, "%s: %s", relationName, aclcheck_error_strings[aclcheck_result]);
#endif
RemoveRewriteRule(rulename); RemoveRewriteRule(rulename);
} }
break; break;
case TYPE_P: case TYPE_P:
#ifndef NO_SECURITY
/* XXX moved to remove.c */ /* XXX moved to remove.c */
#endif
RemoveType(stmt->name); RemoveType(stmt->name);
break; break;
case VIEW: case VIEW:
@ -505,14 +490,11 @@ ProcessUtility(Node *parsetree,
char *viewName = stmt->name; char *viewName = stmt->name;
char *ruleName; char *ruleName;
#ifndef NO_SECURITY
ruleName = MakeRetrieveViewRuleName(viewName); ruleName = MakeRetrieveViewRuleName(viewName);
relationName = RewriteGetRuleEventRel(ruleName); relationName = RewriteGetRuleEventRel(ruleName);
if (!pg_ownercheck(GetUserId(), relationName, RELNAME)) if (!pg_ownercheck(GetUserId(), relationName, RELNAME))
elog(ERROR, "%s: %s", relationName, aclcheck_error_strings[ACLCHECK_NOT_OWNER]); elog(ERROR, "%s: %s", relationName, aclcheck_error_strings[ACLCHECK_NOT_OWNER]);
pfree(ruleName); pfree(ruleName);
#endif
RemoveView(viewName); RemoveView(viewName);
} }
break; break;
@ -810,10 +792,8 @@ ProcessUtility(Node *parsetree,
elog(ERROR, "\"%s\" is a system index. call REINDEX under standalone postgres with -P -O options", elog(ERROR, "\"%s\" is a system index. call REINDEX under standalone postgres with -P -O options",
relname); relname);
} }
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relname, RELNAME)) if (!pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "%s: %s", relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]); elog(ERROR, "%s: %s", relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]);
#endif
ReindexIndex(relname, stmt->force); ReindexIndex(relname, stmt->force);
break; break;
case TABLE: case TABLE:
@ -828,10 +808,8 @@ ProcessUtility(Node *parsetree,
relname); relname);
} }
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relname, RELNAME)) if (!pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "%s: %s", relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]); elog(ERROR, "%s: %s", relname, aclcheck_error_strings[ACLCHECK_NOT_OWNER]);
#endif
ReindexTable(relname, stmt->force); ReindexTable(relname, stmt->force);
break; break;
case DATABASE: case DATABASE:

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.50 2000/10/07 00:58:19 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.51 2000/10/16 17:08:08 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -589,11 +589,9 @@ ExecuteChangeACLStmt(ChangeACLStmt *stmt)
if (rel && rel->rd_rel->relkind == RELKIND_INDEX) if (rel && rel->rd_rel->relkind == RELKIND_INDEX)
elog(ERROR, "\"%s\" is an index relation", elog(ERROR, "\"%s\" is an index relation",
relname); relname);
#ifndef NO_SECURITY
if (!pg_ownercheck(GetUserId(), relname, RELNAME)) if (!pg_ownercheck(GetUserId(), relname, RELNAME))
elog(ERROR, "you do not own class \"%s\"", elog(ERROR, "you do not own class \"%s\"",
relname); relname);
#endif
ChangeAcl(relname, &aclitem, modechg); ChangeAcl(relname, &aclitem, modechg);
/* close rel, but keep lock until end of xact */ /* close rel, but keep lock until end of xact */
heap_close(rel, NoLock); heap_close(rel, NoLock);

3
src/include/config.h.in
View File

@ -8,7 +8,7 @@
* or in config.h afterwards. Of course, if you edit config.h, then your * or in config.h afterwards. Of course, if you edit config.h, then your
* changes will be overwritten the next time you run configure. * changes will be overwritten the next time you run configure.
* *
* $Id: config.h.in,v 1.142 2000/10/14 23:56:58 momjian Exp $ * $Id: config.h.in,v 1.143 2000/10/16 17:08:11 momjian Exp $
*/ */
#ifndef CONFIG_H #ifndef CONFIG_H
@ -276,7 +276,6 @@
/* #define RTDEBUG */ /* #define RTDEBUG */
/* #define GISTDEBUG */ /* #define GISTDEBUG */
/* #define OMIT_PARTIAL_INDEX */ /* #define OMIT_PARTIAL_INDEX */
/* #define NO_SECURITY */
/* #define LOCK_DEBUG */ /* #define LOCK_DEBUG */
/* /*