diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:30:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:30:18 +0200 |
| commit | 0c65e62965eefc1f8cebfaa3636ef72fc21c5260 (patch) | |
| tree | 978590a558f6571af85b424ecff78fb28cf8d552 /runtime/msg.c | |
| parent | a568626d4a627d226f203eb83f41b731e0f00ac9 (diff) | |
| parent | 1824ab8d98b983402315b86954a7ad160b43b508 (diff) | |
| download | rsyslog-0c65e62965eefc1f8cebfaa3636ef72fc21c5260.tar.gz rsyslog-0c65e62965eefc1f8cebfaa3636ef72fc21c5260.tar.xz rsyslog-0c65e62965eefc1f8cebfaa3636ef72fc21c5260.zip | |
Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable
Conflicts:
template.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 01bafb86..aa97dc2d 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2546,11 +2546,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; } } |