- (djm) Use VIS_SAFE on logged strings rather than default strnvis

[openssh.git] / log.c

diff --git a/log.c b/log.c
index ead7e902865607cd955ce6005a2dd1051635c7d2..5a28438f97859f8db09c17c6928d2211263e4d24 100644 (file)
--- a/log.c
+++ b/log.c
@@ -34,7 +34,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: log.c,v 1.24 2002/07/19 15:43:33 markus Exp $");
+RCSID("$OpenBSD: log.c,v 1.27 2003/05/18 23:22:01 deraadt Exp $");
 
 #include "log.h"
 #include "xmalloc.h"
@@ -127,7 +127,7 @@ error(const char *fmt,...)
 /* Log this message (information that usually should go to the log). */
 
 void
-log(const char *fmt,...)
+logit(const char *fmt,...)
 {
        va_list args;
 
@@ -233,6 +233,7 @@ fatal_remove_all_cleanups(void)
                next_cu = cu->next;
                xfree(cu);
        }
+       fatal_cleanups = NULL;
 }
 
 /* Cleanup and exit */
@@ -338,6 +339,9 @@ 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
+       struct syslog_data sdata = SYSLOG_DATA_INIT;
+#endif
        char msgbuf[MSGBUFSIZ];
        char fmtbuf[MSGBUFSIZ];
        char *txt = NULL;
@@ -387,13 +391,20 @@ do_log(LogLevel level, const char *fmt, va_list args)
                vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
        }
        /* Escape magic chars in output. */
-       strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_OCTAL);
+       strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_SAFE|VIS_OCTAL);
        
        if (log_on_stderr) {
-               fprintf(stderr, "%s\r\n", fmtbuf);
+               snprintf(fmtbuf, sizeof fmtbuf, "%s\r\n", msgbuf);
+               write(STDERR_FILENO, fmtbuf, strlen(fmtbuf));
        } else {
+#ifdef OPENLOG_R
+               openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);
+               syslog_r(pri, &sdata, "%.500s", msgbuf);
+               closelog_r(&sdata);
+#else
                openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility);
                syslog(pri, "%.500s", fmtbuf);
                closelog();
+#endif
        }
 }