From 8cb041aadad10e423570b54e71c6237a86c84d95 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 19 Mar 2003 16:08:59 +0000
Subject: [PATCH] Set up the privileges on the default schemas in initdb with
 real GRANT commands, to arrive at a valid and dumpable state.

---
 src/bin/initdb/initdb.sh           |  4 +++-
 src/include/catalog/pg_namespace.h | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 73f4247dfb..6bd01db36b 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -27,7 +27,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.184 2003/02/19 23:41:15 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.185 2003/03/19 16:08:59 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -1035,6 +1035,8 @@ $ECHO_N "setting privileges on built-in objects... "$ECHO_C
         WHERE proacl IS NULL;
     UPDATE pg_language SET lanacl = '{"=U/$POSTGRES_SUPERUSERNAME"}' \
         WHERE lanpltrusted;
+    GRANT USAGE ON SCHEMA pg_catalog TO PUBLIC;
+    GRANT CREATE, USAGE ON SCHEMA public TO PUBLIC;
 EOF
 ) \
 	| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
diff --git a/src/include/catalog/pg_namespace.h b/src/include/catalog/pg_namespace.h
index b1a9855b6c..00083dd518 100644
--- a/src/include/catalog/pg_namespace.h
+++ b/src/include/catalog/pg_namespace.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_namespace.h,v 1.8 2002/09/04 20:31:37 momjian Exp $
+ * $Id: pg_namespace.h,v 1.9 2003/03/19 16:08:59 petere Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -66,14 +66,14 @@ typedef FormData_pg_namespace *Form_pg_namespace;
  * ---------------
  */
 
-DATA(insert OID = 11 ( "pg_catalog" PGUID "{=U}" ));
-DESCR("System catalog namespace");
+DATA(insert OID = 11 ( "pg_catalog" PGUID _null_ ));
+DESCR("System catalog schema");
 #define PG_CATALOG_NAMESPACE 11
-DATA(insert OID = 99 ( "pg_toast" PGUID "{=}" ));
-DESCR("Reserved namespace for TOAST tables");
+DATA(insert OID = 99 ( "pg_toast" PGUID _null_ ));
+DESCR("Reserved schema for TOAST tables");
 #define PG_TOAST_NAMESPACE 99
-DATA(insert OID = 2200 ( "public" PGUID "{=UC}" ));
-DESCR("Standard public namespace");
+DATA(insert OID = 2200 ( "public" PGUID _null_ ));
+DESCR("Standard public schema");
 #define PG_PUBLIC_NAMESPACE 2200