diff options
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 6334cdd7e37..2eca6babb07 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -28,7 +28,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.218 2001/06/11 04:12:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.219 2001/06/12 22:54:05 tgl Exp $ * * NOTES * @@ -362,9 +362,13 @@ PostmasterMain(int argc, char *argv[]) /* * Options setup */ - potential_DataDir = getenv("PGDATA"); /* default value */ + ResetAllOptions(true); + + /* PGPORT environment variable, if set, overrides GUC setting */ + if (getenv("PGPORT")) + PostPortNumber = atoi(getenv("PGPORT")); - ResetAllOptions(); + potential_DataDir = getenv("PGDATA"); /* default value */ /* * First we must scan for a -D argument to get the data dir. Then read |