summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-14 15:27:00 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-14 15:27:00 +0200
commit7eadb67d19da21d7521640d224a2c47ca1b782b5 (patch)
treecec6e5ce2aff4444973ef12490fd1e01e117061e
parent47ca77faca5442014309e6d2ffa3c0484d160da4 (diff)
downloadrsyslog-7eadb67d19da21d7521640d224a2c47ca1b782b5.tar.gz
rsyslog-7eadb67d19da21d7521640d224a2c47ca1b782b5.tar.xz
rsyslog-7eadb67d19da21d7521640d224a2c47ca1b782b5.zip
bugfix: fromhost-ip was sometimes truncated
-rw-r--r--ChangeLog1
-rw-r--r--tools/syslogd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0cddea63..9aca45f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f7253a8e..ade6f1c7 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);