diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:32:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:32:06 +0200 |
| commit | d51aefc052377a2cee103a4d87c7c8dcf8c74081 (patch) | |
| tree | 44f3f02fd9a02af0b74cc7062a0215015e088c68 | |
| parent | 3c1895a699f7d37b49f41f6f758ead4abea0caf2 (diff) | |
| parent | f2ec2e9b206b2f8a30417f303017ae0567cbbc0e (diff) | |
| download | rsyslog-d51aefc052377a2cee103a4d87c7c8dcf8c74081.tar.gz rsyslog-d51aefc052377a2cee103a4d87c7c8dcf8c74081.tar.xz rsyslog-d51aefc052377a2cee103a4d87c7c8dcf8c74081.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
runtime/conf.c
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/conf.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -2,6 +2,8 @@ Version 4.6.4 [v4-stable] (rgerhards), 2010-??-?? - bugfix: zero-sized (empty) messages were processed by imtcp they are now dropped as they always should have been +- bugfix: programname filter in ! configuration can not be reset + Thanks to Kiss Gabor for the patch. --------------------------------------------------------------------------- Version 4.6.3 [v4-stable] (rgerhards), 2010-07-07 - improvded testbench @@ -635,6 +637,8 @@ Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? was random (but most often "on") - bugfix: potential segfault when -p command line option was used thanks to varmojfekoj for pointing me at this bug +- bugfix: programname filter in ! configuration can not be reset + Thanks to Kiss Gabor for the patch. --------------------------------------------------------------------------- Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02 - bugfix: invalid error message issued if $inlcudeConfig was on an empty diff --git a/runtime/conf.c b/runtime/conf.c index ef795237..e2d3a889 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -1015,7 +1015,7 @@ static rsRetVal cflineProcessTagSelector(uchar **pline) if(**pline != '\0' && **pline == '*' && *(*pline+1) == '\0') { dbgprintf("resetting programname filter\n"); if(pDfltProgNameCmp != NULL) { - CHKiRet(rsCStrSetSzStr(pDfltProgNameCmp, NULL)); + rsCStrDestruct(&pDfltProgNameCmp); } } else { dbgprintf("setting programname filter to '%s'\n", *pline); |