diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-30 12:45:37 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-30 12:45:37 +0100 |
| commit | 3fd95bfb5d522adb2e913becc94b272228469d99 (patch) | |
| tree | e010aef6657da4eb57ea8b8e7a5f32d553e26631 | |
| parent | bdce4afc84d4355398a845fae37f5e183a230a46 (diff) | |
| parent | 09a10603ffc1189b332df2042944afb70af5deaf (diff) | |
| download | rsyslog-3fd95bfb5d522adb2e913becc94b272228469d99.tar.gz rsyslog-3fd95bfb5d522adb2e913becc94b272228469d99.tar.xz rsyslog-3fd95bfb5d522adb2e913becc94b272228469d99.zip | |
Merge branch 'v4-beta' into beta
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/msg.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -301,6 +301,8 @@ Version 4.5.7 [v4-beta] (rgerhards), 2009-11-18 Also improved the doc on the debug system. - bugfix (kind of): check if TCP connection is still alive if using TLS Thanks to Jonathan Bond-Caron for the patch. +- bugfix: hostname accidently set to IP address for some message sources, + for example imudp. Thanks to Anton for reporting this bug. - bugfix [imported from 4.4.3]: $ActionExecOnlyOnceEveryInterval did not work. --------------------------------------------------------------------------- diff --git a/runtime/msg.c b/runtime/msg.c index 623c5b4a..cc2f0b69 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1912,7 +1912,7 @@ rsRetVal MsgSetRcvFromIPStr(msg_t *pThis, uchar *psz, int len, prop_t **ppProp) assert(pThis != NULL); CHKiRet(prop.CreateOrReuseStringProp(ppProp, psz, len)); - MsgSetRcvFrom(pThis, *ppProp); + MsgSetRcvFromIP(pThis, *ppProp); finalize_it: RETiRet; |