Move export to a separate line, per Peter E.

bmomjian · bmomjian · commit 357d9bdce5ab · 2001-07-11T19:36:41.000Z
diff --git 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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`#`
`10`	`10`	`# IDENTIFICATION`
`11`		`-# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.22 2001/07/11 16:16:52 momjian Exp $`
	`11`	`+# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.23 2001/07/11 19:36:41 momjian Exp $`
`12`	`12`	`#`
`13`	`13`	`#-------------------------------------------------------------------------`
`14`	`14`
`@@ -128,7 +128,8 @@ do`
`128`	`128`	`-D)`
`129`	`129`	`shift`
`130`	`130`	`# pass environment into new postmaster`
`131`		`- export PGDATA="$1"`
	`131`	`+ PGDATA="$1"`
	`132`	`+ export PGDATA`
`132`	`133`	`;;`
`133`	`134`	`-l)`
`134`	`135`	`logfile="$2"`