diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:58:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:58:53 +0100 |
| commit | c9078c722003ac87e8b39363ed9b8b70d2812dd9 (patch) | |
| tree | 51b44e6eab1a7cb5f80547252468e3c351c8cb36 /template.c | |
| parent | 05bd696ebb7766f33b3ae176b841bcecb0bfedfc (diff) | |
| parent | 4cfbf894fd0caebaf65e1b7ffcb5725a530cf67d (diff) | |
| download | rsyslog-c9078c722003ac87e8b39363ed9b8b70d2812dd9.tar.gz rsyslog-c9078c722003ac87e8b39363ed9b8b70d2812dd9.tar.xz rsyslog-c9078c722003ac87e8b39363ed9b8b70d2812dd9.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
doc/manual.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 |