database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Oops, back out my unintended changes.

Browse Source
This commit is contained in:
Bruce Momjian
2000-10-11 17:58:01 +00:00
parent 5e38665f8a
commit 3d45543698
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/postmaster/postmaster.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* *
@ -543,22 +543,6 @@ PostmasterMain(int argc, char *argv[])
exit(1); exit(1);
} }
/*
* 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 * Check for invalid combinations of switches
*/ */

9
src/backend/utils/misc/guc.c
View File

@ -4,7 +4,7 @@
* Support for grand unified configuration scheme, including SET * Support for grand unified configuration scheme, including SET
* command, configuration file, and command line options. * 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 * Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
@ -237,8 +237,6 @@ ConfigureNamesInt[] =
DEF_NBUFFERS, 16, INT_MAX}, DEF_NBUFFERS, 16, INT_MAX},
{"port", PGC_POSTMASTER, &PostPortName, {"port", PGC_POSTMASTER, &PostPortName,
DEF_PGPORT, 1, 65535}, DEF_PGPORT, 1, 65535},
{"unixsocket", PGC_POSTMASTER, &UnixSocketName,
DEF_PGSOCKETFILE, 1, 65535},
{"sort_mem", PGC_USERSET, &SortMem, {"sort_mem", PGC_USERSET, &SortMem,
512, 1, INT_MAX}, 512, 1, INT_MAX},
@ -374,10 +372,7 @@ ResetAllOptions(void)
} }
if (getenv("PGPORT")) if (getenv("PGPORT"))
PostPortNumber = atoi(getenv("PGPORT")); PostPortName = atoi(getenv("PGPORT"));
if (UnixSocketName == NULL)
UnixSocketName = getenv("PGUNIXSOCKET");
} }