diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-14 15:29:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-14 15:29:17 +0200 |
| commit | c126e4464a2510eaf42526af64f85fa9a303b355 (patch) | |
| tree | aee9e19f226f34a47fc0cce00ffb18cc1515bc6b | |
| parent | 76b3fb796022ae249ae77db5288ceec542e7efa2 (diff) | |
| parent | 9e81945a64fa25bb47348fe7eff502d7852045b5 (diff) | |
| download | rsyslog-c126e4464a2510eaf42526af64f85fa9a303b355.tar.gz rsyslog-c126e4464a2510eaf42526af64f85fa9a303b355.tar.xz rsyslog-c126e4464a2510eaf42526af64f85fa9a303b355.zip | |
Merge branch 'beta'
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -61,6 +61,7 @@ increase. output module interface --------------------------------------------------------------------------- Version 4.5.1 [DEVEL] (rgerhards), 2009-07-?? +- bugfix: fromhost-ip was sometimes truncated - bugfix: potential segfault when zip-compressed syslog records were received (double free) - bugfix: properties inputname, fromhost, fromhost-ip, msg were lost when diff --git a/tools/syslogd.c b/tools/syslogd.c index ea267f58..4c27a662 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -605,7 +605,7 @@ static inline rsRetVal printline(uchar *hname, uchar *hnameIP, uchar *msg, int f if((pMsg->msgFlags & PARSE_HOSTNAME) == 0) MsgSetHOSTNAME(pMsg, hname, ustrlen(hname)); MsgSetRcvFromStr(pMsg, hname, ustrlen(hname), &propFromHost); - CHKiRet(MsgSetRcvFromIPStr(pMsg, hnameIP, ustrlen(hname), &propFromHostIP)); + CHKiRet(MsgSetRcvFromIPStr(pMsg, hnameIP, ustrlen(hnameIP), &propFromHostIP)); MsgSetAfterPRIOffs(pMsg, p - msg); logmsg(pMsg, flags); |