summaryrefslogtreecommitdiffstats
path: root/runtime/ruleset.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-05-10 15:39:42 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-05-10 15:39:42 +0200
commit415b26d5a19d8b1fd50d8e0b7b29cc8527537316 (patch)
tree5a8d0652dfd1ed25cd647e976136b92aa625df73 /runtime/ruleset.c
parent4ae3176e2824607b8016699d3fc3f1f6a8371495 (diff)
downloadrsyslog-415b26d5a19d8b1fd50d8e0b7b29cc8527537316.tar.gz
rsyslog-415b26d5a19d8b1fd50d8e0b7b29cc8527537316.tar.bz2
rsyslog-415b26d5a19d8b1fd50d8e0b7b29cc8527537316.zip
enable shuffling of crypto parameters down through queue definition
Diffstat (limited to 'runtime/ruleset.c')
-rw-r--r--runtime/ruleset.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c
index e3348938..aacbdf57 100644
--- a/runtime/ruleset.c
+++ b/runtime/ruleset.c
@@ -928,7 +928,6 @@ rsRetVal
rulesetProcessCnf(struct cnfobj *o)
{
struct cnfparamvals *pvals;
- struct cnfparamvals *queueParams;
rsRetVal localRet;
uchar *rsName = NULL;
uchar *parserName;
@@ -974,11 +973,10 @@ rulesetProcessCnf(struct cnfobj *o)
}
/* pick up ruleset queue parameters */
- qqueueDoCnfParams(o->nvlst, &queueParams);
- if(queueCnfParamsSet(queueParams)) {
+ if(queueCnfParamsSet(o->nvlst)) {
rsname = (pRuleset->pszName == NULL) ? (uchar*) "[ruleset]" : pRuleset->pszName;
DBGPRINTF("adding a ruleset-specific \"main\" queue for ruleset '%s'\n", rsname);
- CHKiRet(createMainQueue(&pRuleset->pQueue, rsname, queueParams));
+ CHKiRet(createMainQueue(&pRuleset->pQueue, rsname, o->nvlst));
}
finalize_it: