Commit3d45543

committed

Oops, back out my unintended changes.

1 parent5e38665 commit3d45543Copy full SHA for 3d45543

File tree

-24

lines changed

-24

lines changed

Lines changed: 1 addition & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.170 2000/10/11 17:55:32 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.171 2000/10/11 17:58:01 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`*`
`@@ -543,22 +543,6 @@ PostmasterMain(int argc, char *argv[])`
`543`	`543`	`exit(1);`
`544`	`544`	`}`
`545`	`545`
`546`		`-/*`
`547`		`- * Select default values for switches where needed`
`548`		`- */`
`549`		`-if (HostName==NULL)`
`550`		`-{`
`551`		`-if (!(HostName=getenv("PGHOST")))`
`552`		`-{`
`553`		`-HostName="any";`
`554`		`-}`
`555`		`-}`
`556`		`-elseif (!NetServer)`
`557`		`-{`
`558`		`-fprintf(stderr,"%s: -h requires -i.\n",progname);`
`559`		`-exit(1);`
`560`		`-}`
`561`		`-`
`562`	`546`	`/*`
`563`	`547`	`* Check for invalid combinations of switches`
`564`	`548`	`*/`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* Support for grand unified configuration scheme, including SET`
`5`	`5`	`* command, configuration file, and command line options.`
`6`	`6`	`*`
`7`		`- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.13 2000/10/11 17:55:32 momjian Exp $`
	`7`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.14 2000/10/11 17:58:01 momjian Exp $`
`8`	`8`	`*`
`9`	`9`	`* Copyright 2000 by PostgreSQL Global Development Group`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`@@ -237,8 +237,6 @@ ConfigureNamesInt[] =`
`237`	`237`	`DEF_NBUFFERS,16,INT_MAX},`
`238`	`238`	`{"port",PGC_POSTMASTER,&PostPortName,`
`239`	`239`	`DEF_PGPORT,1,65535},`
`240`		`-{"unixsocket",PGC_POSTMASTER,&UnixSocketName,`
`241`		`-DEF_PGSOCKETFILE,1,65535},`
`242`	`240`
`243`	`241`	`{"sort_mem",PGC_USERSET,&SortMem,`
`244`	`242`	`512,1,INT_MAX},`
`@@ -374,10 +372,7 @@ ResetAllOptions(void)`
`374`	`372`	`}`
`375`	`373`
`376`	`374`	`if (getenv("PGPORT"))`
`377`		`-PostPortNumber=atoi(getenv("PGPORT"));`
`378`		`-`
`379`		`-if (UnixSocketName==NULL)`
`380`		`-UnixSocketName=getenv("PGUNIXSOCKET");`
	`375`	`+PostPortName=atoi(getenv("PGPORT"));`
`381`	`376`	`}`
`382`	`377`
`383`	`378`

Comments

(0)