diff options
author | Damien Miller <djm@mindrot.org> | 2004-02-18 22:59:43 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-02-18 22:59:43 +1100 |
commit | 051b0acbbce7218dcfa1521ad22f860aa20b3008 (patch) | |
tree | a768f24c43b82654fc0684b5ac30be541b1ff21c | |
parent | 82c78b3b9dc5000af2294ce2010cf137dc8fa9ec (diff) |
- (djm) [log.c] Tighten openlog_r tests
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | log.c | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -13,6 +13,7 @@ | |||
13 | remove cruft left over from RhostsAuthentication removal; | 13 | remove cruft left over from RhostsAuthentication removal; |
14 | ok markus@ | 14 | ok markus@ |
15 | - (djm) [log.c] Correct use of HAVE_OPENLOG_R | 15 | - (djm) [log.c] Correct use of HAVE_OPENLOG_R |
16 | - (djm) [log.c] Tighten openlog_r tests | ||
16 | 17 | ||
17 | 20040217 | 18 | 20040217 |
18 | - (djm) Simplify the license on code I have written. No code changes. | 19 | - (djm) Simplify the license on code I have written. No code changes. |
@@ -1882,4 +1883,4 @@ | |||
1882 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1883 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1883 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1884 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1884 | 1885 | ||
1885 | $Id: ChangeLog,v 1.3238 2004/02/18 04:42:31 djm Exp $ | 1886 | $Id: ChangeLog,v 1.3239 2004/02/18 11:59:43 djm Exp $ |
@@ -265,7 +265,7 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr) | |||
265 | void | 265 | void |
266 | do_log(LogLevel level, const char *fmt, va_list args) | 266 | do_log(LogLevel level, const char *fmt, va_list args) |
267 | { | 267 | { |
268 | #ifdef HAVE_OPENLOG_R | 268 | #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) |
269 | struct syslog_data sdata = SYSLOG_DATA_INIT; | 269 | struct syslog_data sdata = SYSLOG_DATA_INIT; |
270 | #endif | 270 | #endif |
271 | char msgbuf[MSGBUFSIZ]; | 271 | char msgbuf[MSGBUFSIZ]; |
@@ -321,7 +321,7 @@ do_log(LogLevel level, const char *fmt, va_list args) | |||
321 | snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf); | 321 | snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf); |
322 | write(STDERR_FILENO, msgbuf, strlen(msgbuf)); | 322 | write(STDERR_FILENO, msgbuf, strlen(msgbuf)); |
323 | } else { | 323 | } else { |
324 | #ifdef HAVE_OPENLOG_R | 324 | #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) |
325 | openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata); | 325 | openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata); |
326 | syslog_r(pri, &sdata, "%.500s", fmtbuf); | 326 | syslog_r(pri, &sdata, "%.500s", fmtbuf); |
327 | closelog_r(&sdata); | 327 | closelog_r(&sdata); |