diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
| commit | 0fa5486a4ace7a9be82b37979cf4693aff237340 (patch) | |
| tree | 6c1b10bca2629acc171c1bb8719ef9fe6202a5c0 /runtime/parser.c | |
| parent | 737614054caadf8340b638b368d43f55b7bb3741 (diff) | |
| parent | aba90e82484118f3568ec51c01de5ba845da589a (diff) | |
| download | rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.gz rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.bz2 rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.zip | |
Merge branch 'master' into ultra-reliable
Conflicts:
runtime/rsyslog.h
tests/Makefile.am
tools/syslogd.c
Diffstat (limited to 'runtime/parser.c')
| -rw-r--r-- | runtime/parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/parser.c b/runtime/parser.c index b4ab0a3e..212d40f3 100644 --- a/runtime/parser.c +++ b/runtime/parser.c @@ -283,7 +283,7 @@ rsRetVal parseMsg(msg_t *pMsg) MsgSetUxTradMsg(pMsg, (char*) msg); if(pMsg->bParseHOSTNAME == 0) - MsgSetHOSTNAME(pMsg, (char*) pMsg->pszRcvFrom); + MsgSetHOSTNAME(pMsg, pMsg->pszRcvFrom); /* rger 2005-11-24 (happy thanksgiving!): we now need to check if we have * a traditional syslog message or one formatted according to syslog-protocol. |