diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:15:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:15:24 +0100 |
| commit | ad58b9c8fbc6159a361d40d97decddb95758c0a7 (patch) | |
| tree | dda71332b43cf665a284111b98053a6bc6aecf4a /runtime | |
| parent | c3f07d9dda55a993aebeb4fbb05f1d597de46eaa (diff) | |
| parent | a65f638523ec5d2c7b2b68bdaea174f5bd8b719f (diff) | |
| download | rsyslog-ad58b9c8fbc6159a361d40d97decddb95758c0a7.tar.gz rsyslog-ad58b9c8fbc6159a361d40d97decddb95758c0a7.tar.xz rsyslog-ad58b9c8fbc6159a361d40d97decddb95758c0a7.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
ChangeLog
Diffstat (limited to 'runtime')
| -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 208ea77a..b45775b6 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1908,7 +1908,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; |