diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
| commit | de71589ca3145dfbe8e34790bb49e3d86d3d3bce (patch) | |
| tree | 43a91ec3d4c7306c9ddda820b916e8da71b3d065 /runtime/msg.c | |
| parent | 2f4292a81c2bf89b349f0e276c69616ac6e51164 (diff) | |
| parent | 8939ccfffd3a0580ead376234ad64a9602d4e4e6 (diff) | |
| download | rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.gz rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.bz2 rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.zip | |
Merge branch 'v6-stable'
Conflicts:
ChangeLog
configure.ac
runtime/ruleset.c
tools/syslogd.c
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 99874317..da751dba 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2814,11 +2814,13 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, ++pFld; /* skip to field terminator */ if(*pFld == pTpe->data.field.field_delim) { ++pFld; /* eat it */ +#ifdef STRICT_GPLV3 if (pTpe->data.field.field_expand != 0) { while (*pFld == pTpe->data.field.field_delim) { ++pFld; } } +#endif ++iCurrFld; } } |