Permalink
Browse files

syslogd: fix missing newline problen in memory log buffer. Closes 4159

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
  • Loading branch information...
1 parent c74a79f commit 514cbfc593aaccda22b376e5cc84d3387db2025a Denys Vlasenko committed Sep 16, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 sysklogd/syslogd.c
View
@@ -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

0 comments on commit 514cbfc

Please sign in to comment.