summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-08 15:59:38 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-08 15:59:38 +0100
commita2730f88e137dd57504959d70a8b7842abce6d4d (patch)
tree5ccac29a8d932541e37f959bd1425e91b3494c54
parent58477b825fb84e5181bbaa92fac542965d3aa0e7 (diff)
parentcab2279d5cd003138b32c5e1682ef6606e20ca5d (diff)
downloadrsyslog-a2730f88e137dd57504959d70a8b7842abce6d4d.tar.gz
rsyslog-a2730f88e137dd57504959d70a8b7842abce6d4d.tar.bz2
rsyslog-a2730f88e137dd57504959d70a8b7842abce6d4d.zip
Merge branch 'master' into master-ruleeng
-rw-r--r--ChangeLog2
-rw-r--r--plugins/omhiredis/omhiredis.c5
-rw-r--r--template.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 949adcc6..898ba13b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ Version 7.5.7 [devel] 2013-11-??
- bugfix: ommysql lost configfile/section parameters after first close
This means that when a connection was broken, it was probably
re-instantiated with different parameters than configured.
+- bugfix: regression in template processing with subtrees in templates
+ Thanks to Pavel Levshin for the fix
- bugfix: regular worker threads are not properly (re)started if DA
mode is active.
This occurs only under rare conditions, but definitely is a bug that
diff --git a/plugins/omhiredis/omhiredis.c b/plugins/omhiredis/omhiredis.c
index 7a35bac2..757d5eb2 100644
--- a/plugins/omhiredis/omhiredis.c
+++ b/plugins/omhiredis/omhiredis.c
@@ -97,7 +97,6 @@ BEGINfreeInstance
CODESTARTfreeInstance
closeHiredis(pData);
free(pData->server);
- free(pData->tplName);
ENDfreeInstance
@@ -196,9 +195,9 @@ CODESTARTendTransaction
for ( i = 0; i < pData->count; i++ ) {
redisGetReply ( pData->conn, (void *)&pData->replies[i] );
/* TODO: add error checking here! */
- free ( pData->replies[i] );
+ freeReplyObject ( pData->replies[i] );
}
- freeReplyObject ( pData->replies );
+ free ( pData->replies );
pData->count = 0;
ENDendTransaction
diff --git a/template.c b/template.c
index ebb3f422..e8b5e9f2 100644
--- a/template.c
+++ b/template.c
@@ -1794,7 +1794,7 @@ tplProcessCnf(struct cnfobj *o)
}
}
- if(bHaveSubtree) {
+ if(!bHaveSubtree) {
if(tplType == T_SUBTREE) {
errmsg.LogError(0, RS_RET_ERR, "template '%s' of type subtree needs "
"subtree parameter", name);