diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index 9e94eccf76f9fe61281ee6f20c537b3e88cf666b..bab8dcf108f71831aea04ac598a685a0ae14ca94 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.16 2001/09/03 12:57:50 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.17 2001/09/08 15:24:00 petere Exp $
 Postgres documentation
 -->
 
@@ -9,7 +9,7 @@ Postgres documentation
  </docinfo>
 
  <refmeta>
-  <refentrytitle id="APP-INITDB-TITLE"><application>initdb</application></refentrytitle>
+  <refentrytitle id="APP-INITDB-TITLE">initdb</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo>Application</refmiscinfo>
  </refmeta>
@@ -25,12 +25,12 @@ Postgres documentation
     <group choice="plain">
      <arg>--pgdata </arg>
      <arg>-D </arg>
-     <replaceable>dbdir</replaceable>
+     <replaceable>directory</replaceable>
     </group>
     <group>
-     <arg>--sysid </arg>
-     <arg>-i </arg>
-     <replaceable>sysid</replaceable>
+     <arg>--username </arg>
+     <arg>-U </arg>
+     <replaceable>username</replaceable>
     </group>
     <group><arg>--pwprompt</arg><arg>-W</arg></group>
     <group>
@@ -49,11 +49,12 @@ Postgres documentation
    Description
   </title>
   <para>
-   <application>initdb</application> creates a new
-   <productname>Postgres</productname> database cluster or system.  A
-   database cluster is a collection of databases that are managed by a
-   single postmaster.
+   <command>initdb</command> creates a new
+   <productname>PostgreSQL</productname> database cluster (or database
+   system).  A database cluster is a collection of databases that are
+   managed by a single server instance.
   </para>
+
   <para>
    Creating a database system consists of creating the directories in which
    the database data will live, generating the shared catalog tables 
@@ -66,26 +67,23 @@ Postgres documentation
   </para>
 
   <para>
-   You must not execute <application>initdb</application> as root; it must
-   be run by the Unix user account that will run the database server.
-   This is because you cannot run the database server as root either, but the
-   server needs to have access to the files <application>initdb</application>
-   creates. Furthermore, during the initialization phase, when there are no
-   users and no access controls installed, <productname>Postgres</productname>
-   will only connect with
-   the name of the current Unix user, so you must log in under the account
-   that will own the server process.
+   <command>initdb</command> must be run as the user that will own the
+   server process, because the server needs to have access to the
+   files and directories that <command>initdb</command> creates.
+   Since the server may not be run as root, you must not run
+   <command>initdb</command> as root either.  (It will in fact refuse
+   to do so.)
   </para>
 
   <para>
-   Although <application>initdb</application> will attempt to create the
+   Although <command>initdb</command> will attempt to create the
    specified data directory, often it won't have permission to do so,
    since the parent of the desired data directory is often a root-owned
    directory.  To set up an arrangement like this, create an empty data
-   directory as root, then use <application>chown</application> to hand over
+   directory as root, then use <command>chown</command> to hand over
    ownership of that directory to the database user account, then
-   <application>su</application> to become the database user, and
-   finally run <application>initdb</application> as the database user.
+   <command>su</command> to become the database user, and
+   finally run <command>initdb</command> as the database user.
   </para>
 
   <refsect2>
@@ -94,31 +92,32 @@ Postgres documentation
    <para>
     <variablelist>
      <varlistentry>
-      <term>--pgdata=<replaceable class="parameter">dbdir</replaceable></term>
-      <term>-D <replaceable class="parameter">dbdir</replaceable></term>
+      <term>--pgdata=<replaceable class="parameter">directory</replaceable></term>
+      <term>-D <replaceable class="parameter">directory</replaceable></term>
       <listitem>
        <para>
-        This option specifies where in the file system the database
+        This option specifies the directory where the database system
         should be stored. This is the only information required by
-        <application>initdb</application>, but you can avoid writing it by
+        <command>initdb</command>, but you can avoid writing it by
         setting the <envar>PGDATA</envar> environment variable, which
         can be convenient since the database server
-        (<filename>postmaster</filename>) can find the database
+        (<command>postmaster</command>) can find the database
         directory later by the same variable.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term>--sysid=<replaceable class="parameter">sysid</replaceable></term>
-      <term>-i <replaceable class="parameter">sysid</replaceable></term>
+      <term>--username=<replaceable class="parameter">username</replaceable></term>
+      <term>-U <replaceable class="parameter">username</replaceable></term>
       <listitem>
        <para>
-        Selects the system id of the database superuser. This defaults
-        to the effective user id of the user running
-        <application>initdb</application>. It is really not important
-        what the superuser's sysid is, but one might choose to start
-        the numbering at some number like 1.
+        Selects the user name of the database superuser. This defaults
+        to the name of the effective user running
+        <command>initdb</command>. It is really not important what the
+        superuser's name is, but one might choose to keep the
+        customary name <quote>postgres</quote>, even if the operating
+        system user's name is different.
        </para>
       </listitem>
      </varlistentry>
@@ -128,7 +127,7 @@ Postgres documentation
       <term>-W</term>
       <listitem>
        <para>
-        Makes <application>initdb</application> prompt for a password
+        Makes <command>initdb</command> prompt for a password
         to give the database superuser. If you don't plan on using password
         authentication, this is not important.  Otherwise you won't be
         able to use password authentication until you have a password
@@ -162,7 +161,7 @@ Postgres documentation
       <term>-L <replaceable class="parameter">directory</replaceable></term>
       <listitem>
        <para>
-        Specifies where <application>initdb</application> should find
+        Specifies where <command>initdb</command> should find
         its input files to initialize the database system.  This is
         normally not necessary.  You will be told if you need to
         specify their location explicitly.
@@ -175,7 +174,7 @@ Postgres documentation
       <term>-n</term>
       <listitem>
        <para>
-	By default, when <application>initdb</application>
+	By default, when <command>initdb</command>
 	determines that an error prevented it from completely creating the database
 	system, it removes any files it may have created before discovering
 	that it can't finish the job. This option inhibits tidying-up and is
@@ -191,7 +190,7 @@ Postgres documentation
        <para>
 	Print debugging output from the bootstrap backend and a few other
         messages of lesser interest for the general public.
-	The bootstrap backend is the program <application>initdb</application>
+	The bootstrap backend is the program <command>initdb</command>
 	uses to create the catalog tables.  This option generates a tremendous
 	amount of extremely boring output.
        </para>
@@ -205,11 +204,30 @@ Postgres documentation
  </refsect1>
 
  <refsect1>
-  <title>See also</title>
+  <title>Environment</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><envar>PGDATA</envar></term>
+
+    <listitem>
+     <para>
+      Specifies the directory where the database system is to be
+      stored; may be overridden using the <option>-D</option> option.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
 
-  <simpara>
-   <citetitle>PostgreSQL Administrator's Guide</citetitle>
-  </simpara>
+  <simplelist type="inline">
+   <member><xref linkend="app-postgres"></member>
+   <member><xref linkend="app-postmaster"></member>
+   <member><citetitle>PostgreSQL Administrator's Guide</citetitle></member>
+  </simplelist>
  </refsect1>
 
 </refentry>
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index fda88ae1d484aa74ea85e113e608adf3ea0f4108..839a1e86a75431e2da34d4d618085c6927ce00f2 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.18 2001/09/03 12:57:50 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.19 2001/09/08 15:24:00 petere Exp $
 Postgres documentation
 -->
 
@@ -35,7 +35,7 @@ Postgres documentation
    <arg>-i</arg>
    <arg>-L</arg>
    <arg>-N</arg>
-   <arg>-o <replaceable>file-name</replaceable></arg>
+   <arg>-o <replaceable>filename</replaceable></arg>
    <arg>-O</arg>
    <arg>-P</arg>
    <group>
@@ -58,7 +58,7 @@ Postgres documentation
    <arg>-F</arg>
    <arg>-i</arg>
    <arg>-L</arg>
-   <arg>-o <replaceable>file-name</replaceable></arg>
+   <arg>-o <replaceable>filename</replaceable></arg>
    <arg>-O</arg>
    <arg>-p <replaceable>database</replaceable></arg>
    <arg>-P</arg>
@@ -103,9 +103,12 @@ Postgres documentation
   </para>
 
   <para>
-   When running a stand-alone backend the session user name will
-   automatically be set to the current effective Unix user name.  If
-   that user does not exist the server will not start.
+   When running a stand-alone backend, the session user will be set to
+   the user with id 1.  This user does not actually have to exist, so
+   a stand-alone backend can be used to manually recover from certain
+   kinds of accidental damage to the system catalogs.  Implicit
+   superuser powers are granted to the user with id 1 in stand-alone
+   mode.
   </para>
 
   <refsect2>
@@ -157,14 +160,14 @@ Postgres documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-o <replaceable class="parameter">file-name</replaceable></term>
+      <term>-o <replaceable class="parameter">filename</replaceable></term>
       <listitem>
        <para>
 	Sends all debugging and error output to 
-	<replaceable class="parameter">OutputFile</replaceable>.
+	<replaceable class="parameter">filename</replaceable>.
 	If the backend is running under the <application>postmaster</application>,
 	error messages are still sent to the frontend process as well as to
-	<replaceable class="parameter">OutputFile</replaceable>,
+	<replaceable class="parameter">filename</replaceable>,
 	but debugging output is sent to the controlling tty of the
 	<application>postmaster</application>
 	(since only one file descriptor can be sent to an actual file).
@@ -359,7 +362,7 @@ Postgres documentation
  </refsect1>
 
  <refsect1>
-  <title>See also</title>
+  <title>See Also</title>
 
   <para>
    <xref linkend="app-initdb">,
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 12b4bfe9a5037e5735d9a6b71e6856b44d818cff..0da598fbf4361c92cdd185ceb5dac89bf535159d 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -34,12 +34,13 @@ CREATE USER <replaceable>name</replaceable>
 
   <para>
    In order to bootstrap the database system, a freshly initialized
-   system always contains one predefined user. This user will have
-   the same name as the operating system user that initialized the
-   area (and is presumably being used as the user that runs the
-   server). Thus, often an initial user <quote>postgres</quote>
-   exists. In order to create more users you have to first connect as
-   this initial user.
+   system always contains one predefined user. This user will have the
+   fixed id 1, and by default (unless altered when running
+   <command>initdb</command>) it will have the same name as the
+   operating system user that initialized the area (and is presumably
+   being used as the user that runs the server). Customarily, this user
+   will be called <quote>postgres</quote>. In order to create more
+   users you have to first connect as this initial user.
   </para>
 
   <para>
diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh
index 25c8d7d2d4d3873c27be82feeeae4f731720c2d6..850c32957996867e495331e3a8ee7a62fcd7b4ef 100644
--- a/src/backend/catalog/genbki.sh
+++ b/src/backend/catalog/genbki.sh
@@ -10,7 +10,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.23 2001/08/26 16:55:59 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.24 2001/09/08 15:24:00 petere Exp $
 #
 # NOTES
 #    non-essential whitespace is removed from the generated file.
@@ -183,6 +183,7 @@ sed -e "s/;[ 	]*$//g" \
     -e "s/[ 	]TransactionId/ xid/g" \
     -e "s/^TransactionId/xid/g" \
     -e "s/(TransactionId/(xid/g" \
+    -e "s/PGUID/1/g" \
     -e "s/NAMEDATALEN/$NAMEDATALEN/g" \
     -e "s/DEFAULT_ATTSTATTARGET/$DEFAULTATTSTATTARGET/g" \
     -e "s/INDEX_MAX_KEYS\*2/$INDEXMAXKEYS2/g" \
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index d830dfdfc9049c230f1dd8c682ea83acfd1fdbfc..122a4903615727a3262a87eb85c8629c20c2dc72 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.82 2001/08/17 02:59:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.83 2001/09/08 15:24:00 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -198,7 +198,7 @@ CreateUser(CreateUserStmt *stmt)
 	bool		user_exists = false,
 				sysid_exists = false,
 				havesysid = false;
-	int			max_id = -1;
+	int			max_id;
 	List	   *item, *option;
 	char	   *password = NULL;	/* PostgreSQL user password */
 	bool		encrypt_password = Password_encryption;	/* encrypt password? */
@@ -268,6 +268,8 @@ CreateUser(CreateUserStmt *stmt)
 	if (dsysid)
 	{
 		sysid = intVal(dsysid->arg);
+		if (sysid <= 0)
+			elog(ERROR, "user id must be positive");
 		havesysid = true;
 	}
 	if (dvalidUntil)
@@ -294,6 +296,7 @@ CreateUser(CreateUserStmt *stmt)
 	pg_shadow_dsc = RelationGetDescr(pg_shadow_rel);
 
 	scan = heap_beginscan(pg_shadow_rel, false, SnapshotNow, 0, NULL);
+	max_id = 99;				/* start auto-assigned ids at 100 */
 	while (!user_exists && !sysid_exists &&
 		   HeapTupleIsValid(tuple = heap_getnext(scan, 0)))
 	{
@@ -550,31 +553,31 @@ AlterUser(AlterUserStmt *stmt)
 	new_record[Anum_pg_shadow_usetrace - 1] = heap_getattr(tuple, Anum_pg_shadow_usetrace, pg_shadow_dsc, &null);
 	new_record_nulls[Anum_pg_shadow_usetrace - 1] = null ? 'n' : ' ';
 
-	/* createuser (superuser) */
+	/*
+	 * createuser (superuser) and catupd
+	 *
+	 * XXX It's rather unclear how to handle catupd.  It's probably
+	 * best to keep it equal to the superuser status, otherwise you
+	 * could end up with a situation where no existing superuser can
+	 * alter the catalogs, including pg_shadow!
+	 */
 	if (createuser < 0)
 	{
 		/* don't change */
 		new_record[Anum_pg_shadow_usesuper - 1] = heap_getattr(tuple, Anum_pg_shadow_usesuper, pg_shadow_dsc, &null);
 		new_record_nulls[Anum_pg_shadow_usesuper - 1] = null ? 'n' : ' ';
+
+		new_record[Anum_pg_shadow_usecatupd - 1] = heap_getattr(tuple, Anum_pg_shadow_usecatupd, pg_shadow_dsc, &null);
+		new_record_nulls[Anum_pg_shadow_usecatupd - 1] = null ? 'n' : ' ';
 	}
 	else
 	{
 		new_record[Anum_pg_shadow_usesuper - 1] = BoolGetDatum(createuser > 0);
 		new_record_nulls[Anum_pg_shadow_usesuper - 1] = ' ';
-	}
 
-	/* catupd - set to false if someone's superuser priv is being yanked */
-	if (createuser == 0)
-	{
-		new_record[Anum_pg_shadow_usecatupd - 1] = BoolGetDatum(false);
+		new_record[Anum_pg_shadow_usecatupd - 1] = BoolGetDatum(createuser > 0);
 		new_record_nulls[Anum_pg_shadow_usecatupd - 1] = ' ';
 	}
-	else
-	{
-		/* leave alone */
-		new_record[Anum_pg_shadow_usecatupd - 1] = heap_getattr(tuple, Anum_pg_shadow_usecatupd, pg_shadow_dsc, &null);
-		new_record_nulls[Anum_pg_shadow_usecatupd - 1] = null ? 'n' : ' ';
-	}
 
 	/* password */
 	if (password)
@@ -692,6 +695,11 @@ DropUser(DropUserStmt *stmt)
 
 		usesysid = DatumGetInt32(heap_getattr(tuple, Anum_pg_shadow_usesysid, pg_shadow_dsc, &null));
 
+		if (usesysid == GetUserId())
+			elog(ERROR, "current user cannot be dropped");
+		if (usesysid == GetSessionUserId())
+			elog(ERROR, "session user cannot be dropped");
+
 		/*
 		 * Check if user still owns a database. If so, error out.
 		 *
@@ -825,7 +833,7 @@ CreateGroup(CreateGroupStmt *stmt)
 	bool		group_exists = false,
 				sysid_exists = false,
 				havesysid = false;
-	int			max_id = 0;
+	int			max_id;
 	Datum		new_record[Natts_pg_group];
 	char		new_record_nulls[Natts_pg_group];
 	List	   *item,
@@ -859,6 +867,8 @@ CreateGroup(CreateGroupStmt *stmt)
 	if (dsysid)
 	{
 		sysid = intVal(dsysid->arg);
+		if (sysid <= 0)
+			elog(ERROR, "group id must be positive");
 		havesysid = true;
 	}
 
@@ -875,6 +885,7 @@ CreateGroup(CreateGroupStmt *stmt)
 	pg_group_dsc = RelationGetDescr(pg_group_rel);
 
 	scan = heap_beginscan(pg_group_rel, false, SnapshotNow, 0, NULL);
+	max_id = 99;				/* start auto-assigned ids at 100 */
 	while (!group_exists && !sysid_exists &&
 		   HeapTupleIsValid(tuple = heap_getnext(scan, false)))
 	{
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index a57f3d2624a39ba591dbc20792ef5b2cb1ceadf3..e6da787bc4e5f15c3410e78604e4c0aa275107ef 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.76 2001/08/15 07:07:40 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.77 2001/09/08 15:24:00 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -476,6 +476,20 @@ InitializeSessionUserId(const char *username)
 }
 
 
+void
+InitializeSessionUserIdStandalone(void)
+{
+	/* This function should only be called in a single-user backend. */
+	AssertState(!IsUnderPostmaster);
+
+	/* call only once */
+	AssertState(!OidIsValid(SessionUserId));
+
+	SetSessionUserId(BOOTSTRAP_USESYSID);
+	AuthenticatedUserIsSuperuser = true;
+}
+
+
 /*
  * Change session auth ID while running
  */
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 51c95fb141527e0cce951ee27ec1963deb576181..60338397dbc6b9014c3a2150217e5b4b7852a1d1 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.90 2001/09/07 00:27:29 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.91 2001/09/08 15:24:00 petere Exp $
  *
  *
  *-------------------------------------------------------------------------
@@ -25,6 +25,7 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
+#include "catalog/pg_shadow.h"
 #include "commands/trigger.h"
 #include "commands/variable.h"	/* for set_default_client_encoding() */
 #include "mb/pg_wchar.h"
@@ -43,6 +44,7 @@
 static void ReverifyMyDatabase(const char *name);
 static void InitCommunication(void);
 static void ShutdownPostgres(void);
+static bool ThereIsAtLeastOneUser(void);
 
 int			lockingOff = 0;		/* backend -L switch */
 
@@ -329,12 +331,24 @@ InitPostgres(const char *dbname, const char *username)
 		LockDisable(true);
 
 	/*
-	 * Figure out our postgres user id.  If bootstrapping, we can't
-	 * assume that pg_shadow exists yet, so fake it.
+	 * Figure out our postgres user id.  In standalone mode we use a
+	 * fixed id, otherwise we figure it out from the authenticated
+	 * user name.
 	 */
 	if (bootstrap)
-		SetSessionUserId(geteuid());
+		InitializeSessionUserIdStandalone();
+	else if (!IsUnderPostmaster)
+	{
+		InitializeSessionUserIdStandalone();
+		if (!ThereIsAtLeastOneUser())
+		{
+			elog(NOTICE, "There are currently no users defined in this database system.");
+			elog(NOTICE, "You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'.",
+				 username, BOOTSTRAP_USESYSID);
+		}
+	}
 	else
+		/* normal multiuser case */
 		InitializeSessionUserId(username);
 
 	/*
@@ -406,3 +420,28 @@ ShutdownPostgres(void)
 	 */
 	smgrDoPendingDeletes(false);/* delete as though aborting xact */
 }
+
+
+
+/*
+ * Returns true if at least one user is defined in this database cluster.
+ */
+static bool
+ThereIsAtLeastOneUser(void)
+{
+	Relation	pg_shadow_rel;
+	TupleDesc	pg_shadow_dsc;
+	HeapScanDesc scan;
+	bool		result;
+
+	pg_shadow_rel = heap_openr(ShadowRelationName, AccessExclusiveLock);
+	pg_shadow_dsc = RelationGetDescr(pg_shadow_rel);
+
+	scan = heap_beginscan(pg_shadow_rel, false, SnapshotNow, 0, 0);
+	result = HeapTupleIsValid(heap_getnext(scan, 0));
+
+	heap_endscan(scan);
+	heap_close(pg_shadow_rel, AccessExclusiveLock);
+
+	return result;
+}
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 73cfe8cb9799b9bad3750abc8719fca43ae3bdc5..2f092028480a24bd180ead9c892bce75b7a63c16 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.18 2001/06/13 21:44:41 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.19 2001/09/08 15:24:00 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,6 +34,10 @@ superuser(void)
 	bool		result = false;
 	HeapTuple	utup;
 
+	/* Special escape path in case you deleted all your users. */
+	if (!IsUnderPostmaster && GetUserId() == BOOTSTRAP_USESYSID)
+		return true;
+
 	utup = SearchSysCache(SHADOWSYSID,
 						  ObjectIdGetDatum(GetUserId()),
 						  0, 0, 0);
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 16f7cb95d3cd642131462a8c1270caabf5559d54..ae16fe1c0ecd05cb66919d17c4a367de5abb385b 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -27,7 +27,7 @@
 # Portions Copyright (c) 1996-2001, 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.136 2001/09/06 04:57:29 ishii Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.137 2001/09/08 15:24:00 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -183,7 +183,6 @@ show_setting=
 #       user with the same name as the Unix user running it. That's
 #       a security measure.
 POSTGRES_SUPERUSERNAME="$EffectiveUser"
-POSTGRES_SUPERUSERID=`$PGPATH/pg_id -u`
 
 while [ "$#" -gt 0 ]
 do
@@ -207,15 +206,15 @@ do
                 noclean=yes
                 echo "Running with noclean mode on. Mistakes will not be cleaned up."
                 ;;
-# The sysid of the database superuser. Can be freely changed.
-        --sysid|-i)
-                POSTGRES_SUPERUSERID="$2"
+# The name of the database superuser. Can be freely changed.
+        --username|-U)
+                POSTGRES_SUPERUSERNAME="$2"
                 shift;;
-        --sysid=*)
-                POSTGRES_SUPERUSERID=`echo $1 | sed 's/^--sysid=//'`
+        --username=*)
+                POSTGRES_SUPERUSERNAME=`echo $1 | sed 's/^--username=//'`
                 ;;
-        -i*)
-                POSTGRES_SUPERUSERID=`echo $1 | sed 's/^-i//'`
+        -U*)
+                POSTGRES_SUPERUSERNAME=`echo $1 | sed 's/^-U//'`
                 ;;
 # The default password of the database superuser.
 # Make initdb prompt for the default password of the database superuser.
@@ -276,7 +275,7 @@ if [ "$usage" ]; then
     if [ -n "$MULTIBYTE" ] ; then 
         echo "  -E, --encoding ENCODING     Set the default multibyte encoding for new databases"
     fi
-    echo "  -i, --sysid SYSID           Database sysid for the superuser"
+    echo "  -U, --username NAME         Database superuser name"
     echo "Less commonly used options: "
     echo "  -L DIRECTORY                Where to find the input files"
     echo "  -d, --debug                 Generate lots of debugging output"
@@ -343,7 +342,7 @@ then
     echo
     echo "initdb variables:"
     for var in PGDATA datadir PGPATH MULTIBYTE MULTIBYTEID \
-        POSTGRES_SUPERUSERNAME POSTGRES_SUPERUSERID POSTGRES_BKI \
+        POSTGRES_SUPERUSERNAME POSTGRES_BKI \
         POSTGRES_DESCR POSTGRESQL_CONF_SAMPLE \
 	PG_HBA_SAMPLE PG_IDENT_SAMPLE ; do
         eval "echo '  '$var=\$$var"
@@ -384,11 +383,10 @@ done
 trap 'echo "Caught signal." ; exit_nicely' 1 2 3 15
 
 # Let's go
-echo "This database system will be initialized with user name \"$POSTGRES_SUPERUSERNAME\"."
-echo "This user will own all the data files and must also own the server process."
+echo "The files belonging to this database system will be owned by user \"$EffectiveUser\"."
+echo "This user must also own the server process."
 echo
 
-
 ##########################################################################
 #
 # CREATE DATABASE DIRECTORY
@@ -467,7 +465,6 @@ mkdir "$PGDATA"/base/1 || exit_nicely
 
 cat "$POSTGRES_BKI" \
 | sed -e "s/POSTGRES/$POSTGRES_SUPERUSERNAME/g" \
-      -e "s/PGUID/$POSTGRES_SUPERUSERID/g" \
       -e "s/ENCODING/$MULTIBYTEID/g" \
 | "$PGPATH"/postgres -boot -x1 $PGSQL_OPT $BACKEND_TALK_ARG template1 \
 || exit_nicely
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 0b67a37ad22aedd311ee827cd62f35f67f5b0a28..d583d886288d8a444f1987ddfd9d3326985ee8b2 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catversion.h,v 1.93 2001/08/26 16:56:00 tgl Exp $
+ * $Id: catversion.h,v 1.94 2001/09/08 15:24:00 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200108251
+#define CATALOG_VERSION_NO	200109081
 
 #endif
diff --git a/src/include/catalog/pg_shadow.h b/src/include/catalog/pg_shadow.h
index 49320b4e7d9f57d30213d88b728021a0407beb2d..7a88e868b74ba6bf3a26a23a3175e8a04e05bf79 100644
--- a/src/include/catalog/pg_shadow.h
+++ b/src/include/catalog/pg_shadow.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_shadow.h,v 1.13 2001/08/10 18:57:41 tgl Exp $
+ * $Id: pg_shadow.h,v 1.14 2001/09/08 15:24:00 petere Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -71,4 +71,6 @@ typedef FormData_pg_shadow *Form_pg_shadow;
  */
 DATA(insert ( "POSTGRES" PGUID t t t t _null_ _null_ ));
 
+#define BOOTSTRAP_USESYSID 1
+
 #endif	 /* PG_SHADOW_H */
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 89e0670911b7d940cacbfea2a43ccb4edfac207a..be1fbdd4efcc4775a5fa417485a8a40bd0d16bad 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.89 2001/08/15 18:42:15 momjian Exp $
+ * $Id: miscadmin.h,v 1.90 2001/09/08 15:24:00 petere Exp $
  *
  * NOTES
  *	  some of the information in this file should be moved to
@@ -211,6 +211,7 @@ extern void SetUserId(Oid userid);
 extern Oid	GetSessionUserId(void);
 extern void SetSessionUserId(Oid userid);
 extern void InitializeSessionUserId(const char *username);
+extern void InitializeSessionUserIdStandalone(void);
 extern void SetSessionAuthorization(const char *username);
 
 extern void SetDataDir(const char *dir);