added $Ruleset config command

so we now can define multiple rule sets, we just can not use them ;)
That means we have the foundation to bind listeners to different
rule sets.

1 files changed, 3 insertions, 3 deletions

diff --git a/runtime/conf.c b/runtime/conf.c
index e0ed3d6a..014d5a9a 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -471,7 +471,7 @@ processConfFile(uchar *pConfFile)
 
 	/* we probably have one selector left to be added - so let's do that now */
 	if(pCurrRule != NULL) {
-		CHKiRet(ruleset.AddRule(pCurrRuleset, &pCurrRule));
+		CHKiRet(ruleset.AddRule(rule.GetAssRuleset(pCurrRule), &pCurrRule));
 	}
 
 	/* close the configuration file */
@@ -1141,9 +1141,10 @@ cflineClassic(uchar *p, rule_t **ppRule)
 		 * all.  -- rgerhards, 2007-08-01
 		 */
 		if(*ppRule != NULL) {
-			CHKiRet(ruleset.AddRule(pCurrRuleset, ppRule));
+			CHKiRet(ruleset.AddRule(rule.GetAssRuleset(*ppRule), ppRule));
 		}
 		CHKiRet(rule.Construct(ppRule)); /* create "fresh" selector */
+		CHKiRet(rule.SetAssRuleset(*ppRule, pCurrRuleset)); /* create "fresh" selector */
 		CHKiRet(rule.ConstructFinalize(*ppRule)); /* create "fresh" selector */
 		CHKiRet(cflineDoFilter(&p, *ppRule)); /* pull filters */
 	}
@@ -1166,7 +1167,6 @@ cfline(uchar *line, rule_t **pfCurr)
 	DEFiRet;
 
 	ASSERT(line != NULL);
-if(*pfCurr != NULL){ ISOBJ_TYPE_assert(*pfCurr, rule);}
 
 	dbgprintf("cfline: '%s'\n", line);