diff options
| author | Kiss Gabor (Bitman) <kissg@ssg.ki.iif.hu> | 2010-08-05 08:25:57 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:25:57 +0200 |
| commit | f2ec2e9b206b2f8a30417f303017ae0567cbbc0e (patch) | |
| tree | 6d13232a0cbf2c7fae2b5ac445677ed618b6a2ee | |
| parent | 01e6df368cdec89920d075fe096971481cb8ce49 (diff) | |
| download | rsyslog-f2ec2e9b206b2f8a30417f303017ae0567cbbc0e.tar.gz rsyslog-f2ec2e9b206b2f8a30417f303017ae0567cbbc0e.tar.xz rsyslog-f2ec2e9b206b2f8a30417f303017ae0567cbbc0e.zip | |
program name filter ! in the configuration cannot be reset
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/conf.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -16,6 +16,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 ad2f4c15..001b501d 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -985,8 +985,7 @@ static rsRetVal cflineProcessTagSelector(uchar **pline) if(**pline != '\0' && **pline == '*' && *(*pline+1) == '\0') { dbgprintf("resetting programname filter\n"); if(pDfltProgNameCmp != NULL) { - if((iRet = rsCStrSetSzStr(pDfltProgNameCmp, NULL)) != RS_RET_OK) - return(iRet); + rsCStrDestruct(&pDfltProgNameCmp); } } else { dbgprintf("setting programname filter to '%s'\n", *pline); |