summaryrefslogtreecommitdiffstats
path: root/runtime/ruleset.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-19 09:39:29 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-19 09:39:29 +0200
commite65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124 (patch)
tree2783ebe1f2983311c0b85d738e093da9a2d02aff /runtime/ruleset.c
parentde2fd07836accab563ecbf0405749b6bef9e76b4 (diff)
parentb151584d0929759284c0fb0399709e5ca0e29d60 (diff)
downloadrsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.tar.gz
rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.tar.bz2
rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.zip
Merge branch 'master' into master-ratelimit
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'runtime/ruleset.c')
-rw-r--r--runtime/ruleset.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c
index bdeb61b7..d2c21424 100644
--- a/runtime/ruleset.c
+++ b/runtime/ruleset.c
@@ -378,7 +378,8 @@ evalPROPFILT(struct cnfstmt *stmt, msg_t *pMsg)
goto done;
pszPropVal = MsgGetProp(pMsg, NULL, stmt->d.s_propfilt.propID,
- stmt->d.s_propfilt.propName, &propLen, &pbMustBeFreed);
+ stmt->d.s_propfilt.propName, &propLen,
+ &pbMustBeFreed, NULL);
/* Now do the compares (short list currently ;)) */
switch(stmt->d.s_propfilt.operation ) {