Magellan Linux

Annotation of /trunk/busybox/patches/busybox-1.19.2-syslogd.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1541 - (hide annotations) (download)
Mon Sep 26 15:52:03 2011 UTC (12 years, 8 months ago) by niro
File size: 708 byte(s)
-added upstream patches
1 niro 1541 --- busybox-1.19.2/sysklogd/syslogd.c
2     +++ busybox-1.19.2-syslogd/sysklogd/syslogd.c
3     @@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char
4     parser_t *parser;
5    
6     parser = config_open2(file ? file : "/etc/syslog.conf",
7     - file ? xfopen_for_read : fopen_or_warn_stdin);
8     + file ? xfopen_for_read : fopen_for_read);
9     if (!parser)
10     /* didn't find default /etc/syslog.conf */
11     /* proceed as if we built busybox without config support */
12     @@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, c
13     if (LOG_PRI(pri) < G.logLevel) {
14     #if ENABLE_FEATURE_IPC_SYSLOG
15     if ((option_mask32 & OPT_circularlog) && G.shbuf) {
16     - log_to_shmem(msg);
17     + log_to_shmem(G.printbuf);
18     return;
19     }
20     #endif