diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-02 12:34:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-02 12:34:46 +0200 |
| commit | 743a2ddf9f5bd4c9eca521d45c184788c93b4ce8 (patch) | |
| tree | 65f6a23e91005a28743ed17c5f75522b8f59695f /tools/pmrfc3164.c | |
| parent | c8ac47b5895526b524551c9810ad39f086ee76ca (diff) | |
| parent | 7acbde62c53792ab9a9c1317ec197fe4446941e6 (diff) | |
| download | rsyslog-743a2ddf9f5bd4c9eca521d45c184788c93b4ce8.tar.gz rsyslog-743a2ddf9f5bd4c9eca521d45c184788c93b4ce8.tar.bz2 rsyslog-743a2ddf9f5bd4c9eca521d45c184788c93b4ce8.zip | |
Merge branch 'c9'
Conflicts:
runtime/msg.c
Diffstat (limited to 'tools/pmrfc3164.c')
| -rw-r--r-- | tools/pmrfc3164.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/pmrfc3164.c b/tools/pmrfc3164.c index 5dfa74f0..4f469a2d 100644 --- a/tools/pmrfc3164.c +++ b/tools/pmrfc3164.c @@ -95,6 +95,8 @@ CODESTARTparse if(datetime.ParseTIMESTAMP3339(&(pMsg->tTIMESTAMP), &p2parse, &lenMsg) == RS_RET_OK) { /* we are done - parse pointer is moved by ParseTIMESTAMP3339 */; } else if(datetime.ParseTIMESTAMP3164(&(pMsg->tTIMESTAMP), &p2parse, &lenMsg) == RS_RET_OK) { + if(pMsg->dfltTZ[0] != '\0') + applyDfltTZ(&pMsg->tTIMESTAMP, pMsg->dfltTZ); /* we are done - parse pointer is moved by ParseTIMESTAMP3164 */; } else if(*p2parse == ' ' && lenMsg > 1) { /* try to see if it is slighly malformed - HP procurve seems to do that sometimes */ ++p2parse; /* move over space */ |