summaryrefslogtreecommitdiff
path: root/src/backend/utils/misc/guc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/misc/guc.c')
-rw-r--r--src/backend/utils/misc/guc.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index e877f41e737..cf6831df000 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.12 2000/10/08 09:25:37 ishii Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.13 2000/10/11 17:55:32 momjian Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -237,6 +237,8 @@ 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},
@@ -372,7 +374,10 @@ ResetAllOptions(void)
}
if (getenv("PGPORT"))
- PostPortName = atoi(getenv("PGPORT"));
+ PostPortNumber = atoi(getenv("PGPORT"));
+
+ if (UnixSocketName == NULL)
+ UnixSocketName = getenv("PGUNIXSOCKET");
}