diff options
| author | Tom Lane | 2005-10-14 16:41:41 +0000 |
|---|---|---|
| committer | Tom Lane | 2005-10-14 16:41:41 +0000 |
| commit | 0fa322a14eb09c8ca6c0fbbbc32d359ae9bc5197 (patch) | |
| tree | b318149482ca2ea19a27865f0fa68cfabb8a7000 | |
| parent | 10f14e6e0dfbc5a82d3dc8be7f6be4a4f1bdd72d (diff) | |
Pass a strdup'd ident string to openlog(), to ensure that reallocation
of GUC memory doesn't cause us to start emitting a bogus ident string.
Per report from Han Holl. Also some trivial code cleanup in write_syslog.
| -rw-r--r-- | src/backend/utils/error/elog.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 66c17e2e8cc..b2b431a984e 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.104 2002/11/01 17:55:23 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.104.2.1 2005/10/14 16:41:41 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -634,7 +634,6 @@ write_syslog(int level, const char *line) { static bool openlog_done = false; static unsigned long seq = 0; - static int syslog_fac = LOG_LOCAL0; int len = strlen(line); @@ -643,6 +642,9 @@ write_syslog(int level, const char *line) if (!openlog_done) { + int syslog_fac = LOG_LOCAL0; + char *syslog_ident; + if (strcasecmp(Syslog_facility, "LOCAL0") == 0) syslog_fac = LOG_LOCAL0; if (strcasecmp(Syslog_facility, "LOCAL1") == 0) @@ -659,7 +661,10 @@ write_syslog(int level, const char *line) syslog_fac = LOG_LOCAL6; if (strcasecmp(Syslog_facility, "LOCAL7") == 0) syslog_fac = LOG_LOCAL7; - openlog(Syslog_ident, LOG_PID | LOG_NDELAY, syslog_fac); + syslog_ident = strdup(Syslog_ident); + if (syslog_ident == NULL) /* out of memory already!? */ + syslog_ident = "postgres"; + openlog(syslog_ident, LOG_PID | LOG_NDELAY, syslog_fac); openlog_done = true; } |