From e9c8bed4d3b157097e89ee2611ca731e37ce8d7d Mon Sep 17 00:00:00 2001 From: Sergey Naumov Date: Sat, 16 Apr 2011 19:36:15 +0200 Subject: [PATCH] syslogd: small fix to config patch Signed-off-by: Sergey Naumov Signed-off-by: Denys Vlasenko --- sysklogd/syslogd.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 7ddd3e4c3..0799038e9 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -385,9 +385,15 @@ static void parse_syslogdcfg(const char *file) cur_selector = next_selector; } while (cur_selector); - /* check whether current file name was mentioned in previous rules. - * temporarily use cur_rule as iterator, but *pp_rule still points to - * currently processing rule entry. + /* check whether current file name was mentioned in previous rules or + * as global logfile (G.logFile). + */ + if (strcmp(G.logFile.path, tok[1]) == 0) { + cur_rule->file = &G.logFile; + goto found; + } + /* temporarily use cur_rule as iterator, but *pp_rule still points + * to currently processing rule entry. * NOTE: *pp_rule points to the current (and last in the list) rule. */ for (cur_rule = G.log_rules; cur_rule != *pp_rule; cur_rule = cur_rule->next) {