summaryrefslogtreecommitdiffstats
path: root/template.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-12-01 17:28:36 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-12-01 17:28:36 +0100
commit48877c8ef41787d59a062ab07f5b6ee37eba7ce1 (patch)
treed94876c7521bdd81f0028fe7824bad228b67a5fd /template.c
parentb030fe7b1f8fb26dad24ce23243f11603b5c9d4e (diff)
downloadrsyslog-48877c8ef41787d59a062ab07f5b6ee37eba7ce1.zip
rsyslog-48877c8ef41787d59a062ab07f5b6ee37eba7ce1.tar.gz
rsyslog-48877c8ef41787d59a062ab07f5b6ee37eba7ce1.tar.xz
milestone: added support for CEE-properties in property-based filters
Diffstat (limited to 'template.c')
-rw-r--r--template.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/template.c b/template.c
index 4a15966..1ea2575 100644
--- a/template.c
+++ b/template.c
@@ -113,7 +113,8 @@ rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar **ppBuf, size_t *
iLenVal = pTpe->data.constant.iLenConstant;
bMustBeFreed = 0;
} else if(pTpe->eEntryType == FIELD) {
- pVal = (uchar*) MsgGetProp(pMsg, pTpe, pTpe->data.field.propid, &iLenVal, &bMustBeFreed);
+ pVal = (uchar*) MsgGetProp(pMsg, pTpe, pTpe->data.field.propid,
+ pTpe->data.field.propName, &iLenVal, &bMustBeFreed);
/* we now need to check if we should use SQL option. In this case,
* we must go over the generated string and escape '\'' characters.
* rgerhards, 2005-09-22: the option values below look somewhat misplaced,
@@ -192,7 +193,8 @@ rsRetVal tplToArray(struct template *pTpl, msg_t *pMsg, uchar*** ppArr)
if(pTpe->eEntryType == CONSTANT) {
CHKmalloc(pArr[iArr] = (uchar*)strdup((char*) pTpe->data.constant.pConstant));
} else if(pTpe->eEntryType == FIELD) {
- pVal = (uchar*) MsgGetProp(pMsg, pTpe, pTpe->data.field.propid, &propLen, &bMustBeFreed);
+ pVal = (uchar*) MsgGetProp(pMsg, pTpe, pTpe->data.field.propid,
+ pTpe->data.field.propName, &propLen, &bMustBeFreed);
if(bMustBeFreed) { /* if it must be freed, it is our own private copy... */
pArr[iArr] = pVal; /* ... so we can use it! */
} else {