diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-03-21 23:27:25 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-03-21 23:27:25 +0000 |
| commit | 56c9b73c1d426c79a604df6d6f36293dd9f18754 (patch) | |
| tree | e381610845e8693ec025af08f4ddc405247461d9 /src/backend/commands/sequence.c | |
| parent | 6137ed1b591920d919e437fbf6e2ea07de44a883 (diff) | |
| download | postgresql-56c9b73c1d426c79a604df6d6f36293dd9f18754.tar.gz postgresql-56c9b73c1d426c79a604df6d6f36293dd9f18754.zip | |
Change the aclchk.c routines to uniformly use OIDs to identify the
objects to be privilege-checked. Some change in their APIs would be
necessary no matter what in the schema environment, and simply getting
rid of the name-based interface entirely seems like the best way.
Diffstat (limited to 'src/backend/commands/sequence.c')
| -rw-r--r-- | src/backend/commands/sequence.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index e9df6392bc0..5bcf4f82327 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.72 2002/03/21 16:00:33 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.73 2002/03/21 23:27:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -299,13 +299,13 @@ nextval(PG_FUNCTION_ARGS) rescnt = 0; bool logit = false; - if (pg_aclcheck(seqname, GetUserId(), ACL_UPDATE) != ACLCHECK_OK) - elog(ERROR, "%s.nextval: you don't have permissions to set sequence %s", - seqname, seqname); - /* open and AccessShareLock sequence */ elm = init_sequence("nextval", seqname); + if (pg_class_aclcheck(elm->relid, GetUserId(), ACL_UPDATE) != ACLCHECK_OK) + elog(ERROR, "%s.nextval: you don't have permissions to set sequence %s", + seqname, seqname); + pfree(seqname); if (elm->last != elm->cached) /* some numbers were cached */ @@ -466,13 +466,13 @@ currval(PG_FUNCTION_ARGS) SeqTable elm; int64 result; - if (pg_aclcheck(seqname, GetUserId(), ACL_SELECT) != ACLCHECK_OK) - elog(ERROR, "%s.currval: you don't have permissions to read sequence %s", - seqname, seqname); - /* open and AccessShareLock sequence */ elm = init_sequence("currval", seqname); + if (pg_class_aclcheck(elm->relid, GetUserId(), ACL_SELECT) != ACLCHECK_OK) + elog(ERROR, "%s.currval: you don't have permissions to read sequence %s", + seqname, seqname); + if (elm->increment == 0) /* nextval/read_info were not called */ elog(ERROR, "%s.currval is not yet defined in this session", seqname); @@ -504,14 +504,15 @@ do_setval(char *seqname, int64 next, bool iscalled) Buffer buf; Form_pg_sequence seq; - if (pg_aclcheck(seqname, GetUserId(), ACL_UPDATE) != ACLCHECK_OK) + /* open and AccessShareLock sequence */ + elm = init_sequence("setval", seqname); + + if (pg_class_aclcheck(elm->relid, GetUserId(), ACL_UPDATE) != ACLCHECK_OK) elog(ERROR, "%s.setval: you don't have permissions to set sequence %s", seqname, seqname); - /* open and AccessShareLock sequence */ - elm = init_sequence("setval", seqname); - seq = read_info("setval", elm, &buf); /* lock page' buffer and - * read tuple */ + /* lock page' buffer and read tuple */ + seq = read_info("setval", elm, &buf); if ((next < seq->min_value) || (next > seq->max_value)) elog(ERROR, "%s.setval: value " INT64_FORMAT " is out of bounds (" INT64_FORMAT "," INT64_FORMAT ")", |