diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-18 12:05:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-18 12:05:51 +0100 |
| commit | 599133164d93afb0dab792dadb8f5d6bc3d68a3f (patch) | |
| tree | 9a8f791fa21386d3620fb8297e14e1c5eb231a62 /template.c | |
| parent | a5417f16044d7d56dbceeea09e25ba3e8c47cc01 (diff) | |
| parent | 49dcad849e93551d90cd6298a576b67c4ad0c7ef (diff) | |
| download | rsyslog-599133164d93afb0dab792dadb8f5d6bc3d68a3f.tar.gz rsyslog-599133164d93afb0dab792dadb8f5d6bc3d68a3f.tar.xz rsyslog-599133164d93afb0dab792dadb8f5d6bc3d68a3f.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/property_replacer.html
Diffstat (limited to 'template.c')
| -rw-r--r-- | template.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -558,13 +558,17 @@ static int do_Parameter(unsigned char **pp, struct template *pTpl) pTpe->data.field.nomatchAction = TPL_REGEX_NOMATCH_USE_DFLTSTR; p += 4; /* eat indicator sequence */ } else if(p[0] == 'B' && p[1] == 'L' && p[2] == 'A' && p[3] == 'N' && p[4] == 'K' - && (p[5] == ',' || p[5] == ':')) { + && (p[5] == ',' || p[5] == ':')) { pTpe->data.field.nomatchAction = TPL_REGEX_NOMATCH_USE_BLANK; p += 5; /* eat indicator sequence */ } else if(p[0] == 'F' && p[1] == 'I' && p[2] == 'E' && p[3] == 'L' && p[4] == 'D' - && (p[5] == ',' || p[5] == ':')) { + && (p[5] == ',' || p[5] == ':')) { pTpe->data.field.nomatchAction = TPL_REGEX_NOMATCH_USE_WHOLE_FIELD; p += 5; /* eat indicator sequence */ + } else if(p[0] == 'Z' && p[1] == 'E' && p[2] == 'R' && p[3] == 'O' + && (p[4] == ',' || p[4] == ':')) { + pTpe->data.field.nomatchAction = TPL_REGEX_NOMATCH_USE_ZERO; + p += 4; /* eat indicator sequence */ } else if(p[0] == ',') { /* empty, use default */ pTpe->data.field.nomatchAction = TPL_REGEX_NOMATCH_USE_DFLTSTR; /* do NOT eat indicator sequence, as this was already eaten - the |