summaryrefslogtreecommitdiffstats
path: root/template.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-10 16:35:12 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-10 16:35:12 +0100
commitc8ebe623376bc025bf166ec333ac874c215de816 (patch)
tree2e1c6f6a149bce3844ed21da08e5f0695de3fecc /template.c
parent497bfeb287a75d1fb0f37502d3805307311a574d (diff)
parent76b3f2cd875dca755f4beee8dbf525c23d9730cf (diff)
downloadrsyslog-c8ebe623376bc025bf166ec333ac874c215de816.zip
rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.gz
rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.xz
Merge branch 'v4-beta' into beta
Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c template.c tests/Makefile.am tests/parsertest.sh
Diffstat (limited to 'template.c')
-rw-r--r--template.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/template.c b/template.c
index 23d4b62..d74da47 100644
--- a/template.c
+++ b/template.c
@@ -567,7 +567,7 @@ static int do_Parameter(unsigned char **pp, struct template *pTpl)
cstrDestruct(&pStrB);
return 1;
}
- cstrDestruct(&pStrB);
+ cstrDestruct(&pStrB); /* no longer needed, now use ID */
/* Check frompos, if it has an R, then topos should be a regex */
if(*p == ':') {