diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-30 12:46:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-30 12:46:57 +0100 |
| commit | 8c20add150be92822d2484822b18ead9fd29ac1d (patch) | |
| tree | 104de50208b8da7de474f6a046dbc24496118d34 /runtime/msg.c | |
| parent | 6598615e5bb4e69b9802cf47b1125ce822873ef8 (diff) | |
| parent | 3fd95bfb5d522adb2e913becc94b272228469d99 (diff) | |
| download | rsyslog-8c20add150be92822d2484822b18ead9fd29ac1d.tar.gz rsyslog-8c20add150be92822d2484822b18ead9fd29ac1d.tar.xz rsyslog-8c20add150be92822d2484822b18ead9fd29ac1d.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 0597ea84..755f78cb 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1999,7 +1999,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; |