diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-26 15:33:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-26 15:33:14 +0200 |
| commit | 876597296f27fa4a4beea81124d3e14369490acd (patch) | |
| tree | 50795596d141711ad7e045041613a3041d8974fc /runtime/conf.c | |
| parent | d22f240bc3525f7e112ce44aea6b9f87f8a51c8a (diff) | |
| parent | 7ea63db2f9d6b375dc95696e47357d73927f2d3d (diff) | |
| download | rsyslog-876597296f27fa4a4beea81124d3e14369490acd.tar.gz rsyslog-876597296f27fa4a4beea81124d3e14369490acd.tar.xz rsyslog-876597296f27fa4a4beea81124d3e14369490acd.zip | |
Merge branch 'master' into v5-devel
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index f9c37610..84178fd5 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -837,6 +837,7 @@ static rsRetVal cflineProcessPropFilter(uchar **pline, register rule_t *f) { rsParsObj *pPars; cstr_t *pCSCompOp; + cstr_t *pCSPropName; rsRetVal iRet; int iOffset; /* for compare operations */ @@ -856,12 +857,19 @@ static rsRetVal cflineProcessPropFilter(uchar **pline, register rule_t *f) } /* read property */ - iRet = parsDelimCStr(pPars, &f->f_filterData.prop.pCSPropName, ',', 1, 1, 1); + iRet = parsDelimCStr(pPars, &pCSPropName, ',', 1, 1, 1); if(iRet != RS_RET_OK) { errmsg.LogError(0, iRet, "error %d parsing filter property - ignoring selector", iRet); rsParsDestruct(pPars); return(iRet); } + iRet = propNameToID(pCSPropName, &f->f_filterData.prop.propID); + if(iRet != RS_RET_OK) { + errmsg.LogError(0, iRet, "error %d parsing filter property - ignoring selector", iRet); + rsParsDestruct(pPars); + return(iRet); + } + cstrDestruct(&pCSPropName); /* read operation */ iRet = parsDelimCStr(pPars, &pCSCompOp, ',', 1, 1, 1); |