summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--log.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f5a5e5670..e46b10ff6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
12 [sshd_config.5] 12 [sshd_config.5]
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 16
1620040217 1720040217
17 - (djm) Simplify the license on code I have written. No code changes. 18 - (djm) Simplify the license on code I have written. No code changes.
@@ -1881,4 +1882,4 @@
1881 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1882 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1882 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1883 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1883 1884
1884$Id: ChangeLog,v 1.3237 2004/02/18 03:31:23 djm Exp $ 1885$Id: ChangeLog,v 1.3238 2004/02/18 04:42:31 djm Exp $
diff --git a/log.c b/log.c
index 686a2a43c..e4ea99589 100644
--- a/log.c
+++ b/log.c
@@ -265,7 +265,7 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
265void 265void
266do_log(LogLevel level, const char *fmt, va_list args) 266do_log(LogLevel level, const char *fmt, va_list args)
267{ 267{
268#ifdef OPENLOG_R 268#ifdef HAVE_OPENLOG_R
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 OPENLOG_R 324#ifdef HAVE_OPENLOG_R
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);