Attachment 627213 Details for Bug 847568 – fix for the bug

[patch] fix for the bug

rsyslog-5.8.10-bz847568.patch (text/plain), 2.24 KB, created by Tomas Heinrich on 2012-10-15 06:33:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Heinrich

Created: 2012-10-15 06:33:37 UTC

Size: 2.24 KB

patch

obsolete

>Correction to the order in which selector rules are added
>
>Selector lines can have multiple actions and therefore are not created
>atomicaly. There was an error in specifying at which point they are
>finished. Certain other directives (e.g. $includeConfig) could have
>disrupted their creation and alter the order of execution. This patch
>fixes the bug by changing the location at which the selector lines are
>finalized.
>---
> runtime/conf.c |   23 +++++++++++------------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
>diff --git a/runtime/conf.c b/runtime/conf.c
>index 46a8928..231421c 100644
>--- a/runtime/conf.c
>+++ b/runtime/conf.c
>@@ -1157,18 +1157,6 @@ cflineClassic(uchar *p, rule_t **ppRule)
> 		++p; /* eat '&' */
> 		skipWhiteSpace(&p); /* on to command */
> 	} else {
>-		/* we are finished with the current selector (on previous line).
>-		 * So we now need to check
>-		 * if it has any actions associated and, if so, link it to the linked
>-		 * list. If it has nothing associated with it, we can simply discard
>-		 * it. In any case, we create a fresh selector for our new filter.
>-		 * We have one special case during initialization: then, the current
>-		 * selector is NULL, which means we do not need to care about it at
>-		 * all.  -- rgerhards, 2007-08-01
>-		 */
>-		if(*ppRule != NULL) {
>-			CHKiRet(ruleset.AddRule(rule.GetAssRuleset(*ppRule), ppRule));
>-		}
> 		CHKiRet(rule.Construct(ppRule)); /* create "fresh" selector */
> 		CHKiRet(rule.SetAssRuleset(*ppRule, ruleset.GetCurrent())); /* create "fresh" selector */
> 		CHKiRet(rule.ConstructFinalize(*ppRule)); /* create "fresh" selector */
>@@ -1203,6 +1191,16 @@ cfline(uchar *line, rule_t **pfCurr)
> 
> 	dbgprintf("cfline: '%s'\n", line);
> 
>+	/* A selector line has been created earlier and no more actions are
>+	 * going to be attached to it so add it to the ruleset. This has to
>+	 * be done before any following statement is processed
>+	 * (e.g. $includeConfig). 2012-10-14
>+	 */
>+	if (*line != '&' && *pfCurr != NULL) {
>+		CHKiRet(ruleset.AddRule(rule.GetAssRuleset(*pfCurr), pfCurr));
>+		*pfCurr = NULL;
>+	}
>+
> 	/* check type of line and call respective processing */
> 	switch(*line) {
> 		case '!':
>@@ -1221,6 +1219,7 @@ cfline(uchar *line, rule_t **pfCurr)
> 			break;
> 	}
> 
>+finalize_it:
> 	RETiRet;
> }
> 
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 847568: 627213