syslogd: fix missing newline problen in memory log buffer. Closes 4159
authorDenys Vlasenko <vda.linux@googlemail.com>
Fri, 16 Sep 2011 11:28:52 +0000 (13:28 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Fri, 16 Sep 2011 11:28:52 +0000 (13:28 +0200)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
sysklogd/syslogd.c

index 2f0ca6ac57c4863131623f444c145035e90dcda1..d36d09cafae80082da9de112cec891f8560e2b8e 100644 (file)
@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char *file)
        parser_t *parser;
 
        parser = config_open2(file ? file : "/etc/syslog.conf",
-                               file ? xfopen_for_read : fopen_or_warn_stdin);
+                               file ? xfopen_for_read : fopen_for_read);
        if (!parser)
                /* didn't find default /etc/syslog.conf */
                /* proceed as if we built busybox without config support */
@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, char *msg, int len)
        if (LOG_PRI(pri) < G.logLevel) {
 #if ENABLE_FEATURE_IPC_SYSLOG
                if ((option_mask32 & OPT_circularlog) && G.shbuf) {
-                       log_to_shmem(msg);
+                       log_to_shmem(G.printbuf);
                        return;
                }
 #endif