diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-14 15:28:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-14 15:28:58 +0200 |
| commit | 9e81945a64fa25bb47348fe7eff502d7852045b5 (patch) | |
| tree | a0f9f462b28c3104f353a67fab3cef67d171cb8a | |
| parent | ddd427cf5cb6fea314845940ff1ada8b0bb51b31 (diff) | |
| parent | 7eadb67d19da21d7521640d224a2c47ca1b782b5 (diff) | |
| download | rsyslog-9e81945a64fa25bb47348fe7eff502d7852045b5.tar.gz rsyslog-9e81945a64fa25bb47348fe7eff502d7852045b5.tar.xz rsyslog-9e81945a64fa25bb47348fe7eff502d7852045b5.zip | |
Merge branch 'v4-beta' into v4-devel
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1,5 +1,6 @@ --------------------------------------------------------------------------- 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 f79410d7..7f995e1c 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -600,7 +600,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); |