summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-02-18 15:42:31 +1100
committerDamien Miller <djm@mindrot.org>2004-02-18 15:42:31 +1100
commit82c78b3b9dc5000af2294ce2010cf137dc8fa9ec (patch)
tree0bc701175d2390385e3f83e460e8eada4a858601
parent05a75b6e5b67390fd858eecc6046a39ae9933556 (diff)
- (djm) [log.c] Correct use of HAVE_OPENLOG_R
-rw-r--r--ChangeLog3
-rw-r--r--log.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f5a5e567..e46b10ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
[sshd_config.5]
remove cruft left over from RhostsAuthentication removal;
ok markus@
+ - (djm) [log.c] Correct use of HAVE_OPENLOG_R
20040217
- (djm) Simplify the license on code I have written. No code changes.
@@ -1881,4 +1882,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3237 2004/02/18 03:31:23 djm Exp $
+$Id: ChangeLog,v 1.3238 2004/02/18 04:42:31 djm Exp $
diff --git a/log.c b/log.c
index 686a2a43..e4ea9958 100644
--- a/log.c
+++ b/log.c
@@ -265,7 +265,7 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
void
do_log(LogLevel level, const char *fmt, va_list args)
{
-#ifdef OPENLOG_R
+#ifdef HAVE_OPENLOG_R
struct syslog_data sdata = SYSLOG_DATA_INIT;
#endif
char msgbuf[MSGBUFSIZ];
@@ -321,7 +321,7 @@ do_log(LogLevel level, const char *fmt, va_list args)
snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf);
write(STDERR_FILENO, msgbuf, strlen(msgbuf));
} else {
-#ifdef OPENLOG_R
+#ifdef HAVE_OPENLOG_R
openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);
syslog_r(pri, &sdata, "%.500s", fmtbuf);
closelog_r(&sdata);