diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | log.c | 11 |
2 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20030525 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - djm@cvs.openbsd.org 2003/05/24 09:02:22 | ||
4 | [log.c] | ||
5 | pass logged data through strnvis; ok markus | ||
6 | |||
1 | 20030524 | 7 | 20030524 |
2 | - (dtucker) Correct --osfsia in INSTALL. Patch by skeleten at shillest.net | 8 | - (dtucker) Correct --osfsia in INSTALL. Patch by skeleten at shillest.net |
3 | 9 | ||
@@ -1605,4 +1611,4 @@ | |||
1605 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1611 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1606 | ok provos@ | 1612 | ok provos@ |
1607 | 1613 | ||
1608 | $Id: ChangeLog,v 1.2749 2003/05/24 01:41:16 dtucker Exp $ | 1614 | $Id: ChangeLog,v 1.2750 2003/05/25 04:38:02 djm Exp $ |
@@ -34,12 +34,13 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | RCSID("$OpenBSD: log.c,v 1.27 2003/05/18 23:22:01 deraadt Exp $"); | 37 | RCSID("$OpenBSD: log.c,v 1.28 2003/05/24 09:02:22 djm Exp $"); |
38 | 38 | ||
39 | #include "log.h" | 39 | #include "log.h" |
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | 41 | ||
42 | #include <syslog.h> | 42 | #include <syslog.h> |
43 | #include <vis.h> | ||
43 | 44 | ||
44 | static LogLevel log_level = SYSLOG_LEVEL_INFO; | 45 | static LogLevel log_level = SYSLOG_LEVEL_INFO; |
45 | static int log_on_stderr = 1; | 46 | static int log_on_stderr = 1; |
@@ -390,16 +391,14 @@ do_log(LogLevel level, const char *fmt, va_list args) | |||
390 | } else { | 391 | } else { |
391 | vsnprintf(msgbuf, sizeof(msgbuf), fmt, args); | 392 | vsnprintf(msgbuf, sizeof(msgbuf), fmt, args); |
392 | } | 393 | } |
393 | /* Escape magic chars in output. */ | ||
394 | strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_SAFE|VIS_OCTAL); | 394 | strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_SAFE|VIS_OCTAL); |
395 | |||
396 | if (log_on_stderr) { | 395 | if (log_on_stderr) { |
397 | snprintf(fmtbuf, sizeof fmtbuf, "%s\r\n", msgbuf); | 396 | snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf); |
398 | write(STDERR_FILENO, fmtbuf, strlen(fmtbuf)); | 397 | write(STDERR_FILENO, msgbuf, strlen(msgbuf)); |
399 | } else { | 398 | } else { |
400 | #ifdef OPENLOG_R | 399 | #ifdef OPENLOG_R |
401 | openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata); | 400 | openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata); |
402 | syslog_r(pri, &sdata, "%.500s", msgbuf); | 401 | syslog_r(pri, &sdata, "%.500s", fmtbuf); |
403 | closelog_r(&sdata); | 402 | closelog_r(&sdata); |
404 | #else | 403 | #else |
405 | openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility); | 404 | openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility); |