diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:50:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:50:55 +0200 |
| commit | d72fe36f868ea12f246ed23bb81ece0240dd6c12 (patch) | |
| tree | ec1023ab0ad27589a6f425c79855f92f7637b686 /runtime/conf.c | |
| parent | f02d77f4b45d0a5a0ce86a87f056c91de1e4b731 (diff) | |
| parent | ebba229db9d89e69b60e542e3c49f25ed9ebc6fc (diff) | |
| download | rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.tar.gz rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.tar.xz rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.zip | |
Merge branch 'master' into newconf
Conflicts:
doc/manual.html
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 1d80c867..1f0badcb 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -1017,7 +1017,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); |