diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:55:41 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:55:41 +0200 |
commit | 8939ccfffd3a0580ead376234ad64a9602d4e4e6 (patch) | |
tree | 1749d023b626b2d30d9b9273b0d4f11fcbffea1b /runtime/msg.c | |
parent | 0f52727043736b1e411bc60309ed18d41a4f1234 (diff) | |
parent | 0c65e62965eefc1f8cebfaa3636ef72fc21c5260 (diff) | |
download | rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.gz rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.xz rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.zip |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
action.c
configure.ac
doc/manual.html
runtime/ruleset.c
template.h
threads.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; } } |