diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/utils/acl.h | 30 | ||||
| -rw-r--r-- | src/include/utils/fcache.h | 4 | ||||
| -rw-r--r-- | src/include/utils/lsyscache.h | 3 |
3 files changed, 18 insertions, 19 deletions
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 146f04a27a..cf06ee7471 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.43 2002/04/21 00:26:44 tgl Exp $ + * $Id: acl.h,v 1.44 2002/04/27 03:45:03 tgl Exp $ * * NOTES * For backward-compatibility purposes we have to allow there @@ -165,13 +165,12 @@ typedef ArrayType IdList; /* result codes for pg_*_aclcheck */ -#define ACLCHECK_OK 0 -#define ACLCHECK_NO_PRIV 1 -#define ACLCHECK_NO_CLASS 2 -#define ACLCHECK_NOT_OWNER 3 - -/* error messages (index by ACLCHECK_* result code). set in aclchk.c. */ -extern const char * const aclcheck_error_strings[]; +typedef enum +{ + ACLCHECK_OK = 0, + ACLCHECK_NO_PRIV, + ACLCHECK_NOT_OWNER +} AclResult; /* * routines used internally @@ -181,7 +180,7 @@ extern Acl *aclinsert3(const Acl *old_acl, const AclItem *mod_aip, unsigned modechg); /* - * exported routines (from acl.c) + * SQL functions (from acl.c) */ extern Datum aclitemin(PG_FUNCTION_ARGS); extern Datum aclitemout(PG_FUNCTION_ARGS); @@ -196,12 +195,13 @@ extern void ExecuteGrantStmt(GrantStmt *stmt); extern AclId get_grosysid(char *groname); extern char *get_groname(AclId grosysid); -/* these return ACLCHECK_* result codes */ -extern int32 pg_class_aclcheck(Oid table_oid, Oid userid, AclMode mode); -extern int32 pg_database_aclcheck(Oid db_oid, Oid userid, AclMode mode); -extern int32 pg_proc_aclcheck(Oid proc_oid, Oid userid, AclMode mode); -extern int32 pg_language_aclcheck(Oid lang_oid, Oid userid, AclMode mode); -extern int32 pg_namespace_aclcheck(Oid nsp_oid, Oid userid, AclMode mode); +extern AclResult pg_class_aclcheck(Oid table_oid, Oid userid, AclMode mode); +extern AclResult pg_database_aclcheck(Oid db_oid, Oid userid, AclMode mode); +extern AclResult pg_proc_aclcheck(Oid proc_oid, Oid userid, AclMode mode); +extern AclResult pg_language_aclcheck(Oid lang_oid, Oid userid, AclMode mode); +extern AclResult pg_namespace_aclcheck(Oid nsp_oid, Oid userid, AclMode mode); + +extern void aclcheck_error(AclResult errcode, const char *objectname); /* ownercheck routines just return true (owner) or false (not) */ extern bool pg_class_ownercheck(Oid class_oid, Oid userid); diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h index fdc84c2122..6bb75f52df 100644 --- a/src/include/utils/fcache.h +++ b/src/include/utils/fcache.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fcache.h,v 1.21 2002/02/18 23:11:46 petere Exp $ + * $Id: fcache.h,v 1.22 2002/04/27 03:45:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -41,8 +41,6 @@ typedef struct FunctionCache */ FmgrInfo func; - bool permission_ok; - /* * setArgsValid is true when we are evaluating a set-valued function * and we are in the middle of a call series; we want to pass the same diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 2ad672b1e4..f57219df11 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.49 2002/04/05 00:31:35 tgl Exp $ + * $Id: lsyscache.h,v 1.50 2002/04/27 03:45:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -37,6 +37,7 @@ extern Oid get_commutator(Oid opno); extern Oid get_negator(Oid opno); extern RegProcedure get_oprrest(Oid opno); extern RegProcedure get_oprjoin(Oid opno); +extern char *get_func_name(Oid funcid); extern Oid get_func_rettype(Oid funcid); extern char func_volatile(Oid funcid); extern Oid get_relname_relid(const char *relname, Oid relnamespace); |