diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-02-01 17:35:09 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-02-01 17:35:09 +1100 |
commit | 9b5495d23ee28fa77dc58a31953d3f6f86d5baa1 (patch) | |
tree | 9d59888e0551238b940dd4978354330584d174d4 /log.c | |
parent | 218f178cb20c276027e972bff0208043fcf533a3 (diff) |
- (dtucker) [log.c] Bug #973: force log_init() to open syslog, since on some
platforms syslog will revert to its default values. This may result in
messages from external libraries (eg libwrap) being sent to a different
facility.
Diffstat (limited to 'log.c')
-rw-r--r-- | log.c | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -194,6 +194,9 @@ void | |||
194 | log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr) | 194 | log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr) |
195 | { | 195 | { |
196 | argv0 = av0; | 196 | argv0 = av0; |
197 | #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) | ||
198 | struct syslog_data sdata = SYSLOG_DATA_INIT; | ||
199 | #endif | ||
197 | 200 | ||
198 | switch (level) { | 201 | switch (level) { |
199 | case SYSLOG_LEVEL_QUIET: | 202 | case SYSLOG_LEVEL_QUIET: |
@@ -261,6 +264,19 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr) | |||
261 | (int) facility); | 264 | (int) facility); |
262 | exit(1); | 265 | exit(1); |
263 | } | 266 | } |
267 | |||
268 | /* | ||
269 | * If an external library (eg libwrap) attempts to use syslog | ||
270 | * immediately after reexec, syslog may be pointing to the wrong | ||
271 | * facility, so we force an open/close of syslog here. | ||
272 | */ | ||
273 | #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) | ||
274 | openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata); | ||
275 | closelog_r(&sdata); | ||
276 | #else | ||
277 | openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility); | ||
278 | closelog(); | ||
279 | #endif | ||
264 | } | 280 | } |
265 | 281 | ||
266 | #define MSGBUFSIZ 1024 | 282 | #define MSGBUFSIZ 1024 |