Move export to a separate line, per Peter E.

diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample
index ddd3994a7236ab2942581c2d425463bd2e30c158..c6711fc08e0c2668e47afb6f062590d8b70ce419 100644 (file)
--- a/src/backend/libpq/pg_hba.conf.sample
+++ b/src/backend/libpq/pg_hba.conf.sample
@@ -124,15 +124,15 @@
 #              usernames stored in secondary password files but not
 #              secondary passwords.
 # 
-#   ident:     Authentication is done by the ident server on the remote
-#              host. AUTH_ARGUMENT is required and maps names found in
-#              the $PGDATA/pg_ident.conf file. The connection is
-#              accepted if the file contains an entry for this map
+#   ident: Authentication is done by the ident server on the local 
+#              or remote host. AUTH_ARGUMENT is required and maps names 
+#              found in the $PGDATA/pg_ident.conf file. The connection
+#              is accepted if the file contains an entry for this map
 #              name with the ident-supplied username and the requested
 #              PostgreSQL username. The special map name "sameuser"
-#              indicates an implied map (not in pg_ident.conf)
-#              that maps each ident username to the identical
-#              PostgreSQL username.
+#              indicates an implied map (not in pg_ident.conf) that
+#              maps each ident username to the identical PostgreSQL 
+#              username.
 # 
 #   krb4:      Kerberos V4 authentication is used.
 # 

diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
index 0e2b56cbfe96dd68b5ba21c494d946a1e5c6a339..997e34f6dd96cdf4678de7562e2f89e2bdd9fed2 100755 (executable)
--- a/src/bin/pg_ctl/pg_ctl.sh
+++ b/src/bin/pg_ctl/pg_ctl.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.22 2001/07/11 16:16:52 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.23 2001/07/11 19:36:41 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -128,7 +128,8 @@ do
        -D)
            shift
            # pass environment into new postmaster
-           export PGDATA="$1"
+           PGDATA="$1"
+           export PGDATA
            ;;
        -l)
            logfile="$2"