diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/pqcomm.c | 6 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 5609b0e2790..c3e25958022 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -30,7 +30,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.174 2004/12/31 21:59:50 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.175 2005/01/12 16:38:17 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -298,7 +298,9 @@ StreamServerPort(int family, char *hostName, unsigned short portNumber, } if (listen_index >= MaxListen) { - /* Nothing found. */ + ereport(LOG, + (errmsg("could not bind to all requested addresses: MAXLISTEN (%d) exceeded", + MaxListen))); break; } diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 6a7cc060963..c5f4899c732 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.442 2004/12/31 22:00:40 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.443 2005/01/12 16:38:17 tgl Exp $ * * NOTES * @@ -92,6 +92,7 @@ #include <DNSServiceDiscovery/DNSServiceDiscovery.h> #endif +#include "catalog/pg_control.h" #include "catalog/pg_database.h" #include "commands/async.h" #include "lib/dllist.h" @@ -167,7 +168,7 @@ int ReservedBackends; static const char *progname = NULL; /* The socket(s) we're listening to. */ -#define MAXLISTEN 10 +#define MAXLISTEN 64 static int ListenSocket[MAXLISTEN]; /* @@ -337,8 +338,8 @@ typedef struct #endif char my_exec_path[MAXPGPATH]; char ExtraOptions[MAXPGPATH]; - char lc_collate[MAXPGPATH]; - char lc_ctype[MAXPGPATH]; + char lc_collate[LOCALE_NAME_BUFLEN]; + char lc_ctype[LOCALE_NAME_BUFLEN]; } BackendParameters; static void read_backend_variables(char *id, Port *port); @@ -3682,8 +3683,8 @@ save_backend_variables(BackendParameters *param, Port *port, StrNCpy(param->ExtraOptions, ExtraOptions, MAXPGPATH); - StrNCpy(param->lc_collate, setlocale(LC_COLLATE, NULL), MAXPGPATH); - StrNCpy(param->lc_ctype, setlocale(LC_CTYPE, NULL), MAXPGPATH); + StrNCpy(param->lc_collate, setlocale(LC_COLLATE, NULL), LOCALE_NAME_BUFLEN); + StrNCpy(param->lc_ctype, setlocale(LC_CTYPE, NULL), LOCALE_NAME_BUFLEN); return true; } |