diff options
| author | Bruce Momjian | 2000-10-11 17:58:01 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2000-10-11 17:58:01 +0000 |
| commit | 3d455436980912bb56b7237cd397999d77f133f0 (patch) | |
| tree | 88ef2dde572bbc62929c9ede755591d6ad5712fb | |
| parent | 5e38665f8a80154417e4351b600466d36dca7b26 (diff) | |
Oops, back out my unintended changes.
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 18 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 9 |
2 files changed, 3 insertions, 24 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 90fc52d7e5f..2f4c2a19fc3 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.170 2000/10/11 17:55:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.171 2000/10/11 17:58:01 momjian Exp $ * * NOTES * @@ -544,22 +544,6 @@ PostmasterMain(int argc, char *argv[]) } /* - * Select default values for switches where needed - */ - if (HostName == NULL) - { - if (!(HostName = getenv("PGHOST"))) - { - HostName = "any"; - } - } - else if (!NetServer) - { - fprintf(stderr, "%s: -h requires -i.\n", progname); - exit(1); - } - - /* * Check for invalid combinations of switches */ if (NBuffers < 2 * MaxBackends || NBuffers < 16) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index cf6831df000..9ed8f9c16d3 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4,7 +4,7 @@ * Support for grand unified configuration scheme, including SET * command, configuration file, and command line options. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.13 2000/10/11 17:55:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.14 2000/10/11 17:58:01 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -237,8 +237,6 @@ ConfigureNamesInt[] = DEF_NBUFFERS, 16, INT_MAX}, {"port", PGC_POSTMASTER, &PostPortName, DEF_PGPORT, 1, 65535}, - {"unixsocket", PGC_POSTMASTER, &UnixSocketName, - DEF_PGSOCKETFILE, 1, 65535}, {"sort_mem", PGC_USERSET, &SortMem, 512, 1, INT_MAX}, @@ -374,10 +372,7 @@ ResetAllOptions(void) } if (getenv("PGPORT")) - PostPortNumber = atoi(getenv("PGPORT")); - - if (UnixSocketName == NULL) - UnixSocketName = getenv("PGUNIXSOCKET"); + PostPortName = atoi(getenv("PGPORT")); } |