diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 16:30:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 16:30:13 +0200 |
| commit | 945bc9bd0d9de984ab11b9faf609b809a1f3cb90 (patch) | |
| tree | f3464946b2eef29b2f8a4e54c32f7bf063a2c27f /tools/pmrfc5424.c | |
| parent | f057fb2db388cc16475f9c5a7de64aeb1f3bdb43 (diff) | |
| parent | eccfbf71f9dbc235309c2ad40035d41620f5e5df (diff) | |
| download | rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.gz rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.xz rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.zip | |
Merge branch 'v5-beta' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'tools/pmrfc5424.c')
| -rw-r--r-- | tools/pmrfc5424.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/pmrfc5424.c b/tools/pmrfc5424.c index 2bd18042..b06f1347 100644 --- a/tools/pmrfc5424.c +++ b/tools/pmrfc5424.c @@ -142,7 +142,7 @@ static int parseRFCStructuredData(uchar **pp2parse, uchar *pResult, int *pLenStr * structured data. There may also be \] inside the structured data, which * do NOT terminate an element. */ - if(lenStr == 0 || *p2parse != '[') + if(lenStr == 0 || (*p2parse != '[' && *p2parse != '-')) return 1; /* this is NOT structured data! */ if(*p2parse == '-') { /* empty structured data? */ @@ -211,7 +211,6 @@ static int parseRFCStructuredData(uchar **pp2parse, uchar *pResult, int *pLenStr * * rger, 2005-11-24 */ -//static int parseRFCSyslogMsg(msg_t *pMsg, int flags) BEGINparse uchar *p2parse; uchar *pBuf = NULL; |