diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:40:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:40:18 +0200 |
| commit | ebba229db9d89e69b60e542e3c49f25ed9ebc6fc (patch) | |
| tree | aaba2a10abbd8c2e4210c6441e79c33d9362ae48 /runtime/conf.c | |
| parent | 676939f61671f96e80323cf929ee506f3844fcfc (diff) | |
| parent | ae2d1c6fcb25867f2c6aa8e342a24afb43442e6a (diff) | |
| download | rsyslog-ebba229db9d89e69b60e542e3c49f25ed9ebc6fc.tar.gz rsyslog-ebba229db9d89e69b60e542e3c49f25ed9ebc6fc.tar.xz rsyslog-ebba229db9d89e69b60e542e3c49f25ed9ebc6fc.zip | |
Merge branch 'v4-devel' into master
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 96d9dcab..d41f2950 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -1014,7 +1014,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); |