5 files changed, 24 insertions, 21 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index fc434a9a511..5f60e7dfcb0 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catversion.h,v 1.166 2002/11/25 18:12:11 tgl Exp $
+ * $Id: catversion.h,v 1.167 2002/12/04 05:18:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200211251
+#define CATALOG_VERSION_NO	200212031
 
 #endif
diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h
index 47e01c5de35..63dd6101bfe 100644
--- a/src/include/catalog/pg_conversion.h
+++ b/src/include/catalog/pg_conversion.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_conversion.h,v 1.7 2002/11/02 02:33:03 tgl Exp $
+ * $Id: pg_conversion.h,v 1.8 2002/12/04 05:18:35 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -19,6 +19,8 @@
 #ifndef PG_CONVERSION_H
 #define PG_CONVERSION_H
 
+#include "miscadmin.h"
+
 /* ----------------
  *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
@@ -84,7 +86,7 @@ typedef FormData_pg_conversion *Form_pg_conversion;
 #include "nodes/parsenodes.h"
 
 extern Oid ConversionCreate(const char *conname, Oid connamespace,
-				 int32 conowner,
+				 AclId conowner,
 				 int32 conforencoding, int32 contoencoding,
 				 Oid conproc, bool def);
 extern void ConversionDrop(Oid conversionOid, DropBehavior behavior);
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index f956129acfe..a840eb22f01 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.276 2002/11/08 17:27:03 momjian Exp $
+ * $Id: pg_proc.h,v 1.277 2002/12/04 05:18:36 momjian Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -2738,7 +2738,7 @@ DATA(insert OID = 1937 (  pg_stat_get_backend_pid		PGNSP PGUID 12 f f t f s 1 23
 DESCR("Statistics: PID of backend");
 DATA(insert OID = 1938 (  pg_stat_get_backend_dbid		PGNSP PGUID 12 f f t f s 1 26 "23"	pg_stat_get_backend_dbid - _null_ ));
 DESCR("Statistics: Database ID of backend");
-DATA(insert OID = 1939 (  pg_stat_get_backend_userid	PGNSP PGUID 12 f f t f s 1 26 "23"	pg_stat_get_backend_userid - _null_ ));
+DATA(insert OID = 1939 (  pg_stat_get_backend_userid	PGNSP PGUID 12 f f t f s 1 23 "23"	pg_stat_get_backend_userid - _null_ ));
 DESCR("Statistics: User ID of backend");
 DATA(insert OID = 1940 (  pg_stat_get_backend_activity	PGNSP PGUID 12 f f t f s 1 25 "23"	pg_stat_get_backend_activity - _null_ ));
 DESCR("Statistics: Current query of backend");
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 1dbd737db3b..86d6ac71157 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.111 2002/10/03 17:07:53 momjian Exp $
+ * $Id: miscadmin.h,v 1.112 2002/12/04 05:18:34 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file should be moved to
@@ -202,7 +202,13 @@ extern void SetDatabasePath(const char *path);
 
 extern char *GetUserNameFromId(Oid userid);
 
-extern Oid	GetUserId(void);
+/*
+ * AclId		system identifier for the user, group, etc.
+ *				XXX Perhaps replace this type by OID?
+ */
+typedef uint32 AclId;
+
+extern AclId GetUserId(void);
 extern void SetUserId(Oid userid);
 extern Oid	GetSessionUserId(void);
 extern void SetSessionUserId(Oid userid);
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index e7f609f0615..f03618eaaf0 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: acl.h,v 1.47 2002/09/04 20:31:45 momjian Exp $
+ * $Id: acl.h,v 1.48 2002/12/04 05:18:38 momjian Exp $
  *
  * NOTES
  *	  For backward-compatibility purposes we have to allow there
@@ -22,16 +22,11 @@
 #ifndef ACL_H
 #define ACL_H
 
+#include "miscadmin.h"
 #include "nodes/parsenodes.h"
 #include "utils/array.h"
 
 
-/*
- * AclId		system identifier for the user, group, etc.
- *				XXX Perhaps replace this type by OID?
- */
-typedef uint32 AclId;
-
 #define ACL_ID_WORLD	0		/* placeholder for id in a WORLD acl item */
 
 /*
@@ -204,11 +199,11 @@ 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);
-extern bool pg_type_ownercheck(Oid type_oid, Oid userid);
-extern bool pg_oper_ownercheck(Oid oper_oid, Oid userid);
-extern bool pg_proc_ownercheck(Oid proc_oid, Oid userid);
-extern bool pg_namespace_ownercheck(Oid nsp_oid, Oid userid);
-extern bool pg_opclass_ownercheck(Oid opc_oid, Oid userid);
+extern bool pg_class_ownercheck(Oid class_oid, AclId userid);
+extern bool pg_type_ownercheck(Oid type_oid, AclId userid);
+extern bool pg_oper_ownercheck(Oid oper_oid, AclId userid);
+extern bool pg_proc_ownercheck(Oid proc_oid, AclId userid);
+extern bool pg_namespace_ownercheck(Oid nsp_oid, AclId userid);
+extern bool pg_opclass_ownercheck(Oid opc_oid, AclId userid);
 
 #endif   /* ACL_H */