diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-01 16:01:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-01 16:01:32 +0100 |
| commit | 75a585a7e26d4d6cf59157cf62584c139af1527c (patch) | |
| tree | b7c29c3cb0234f70dcd64259c5b58c64a2311c75 /runtime | |
| parent | c130eb20215d5f4ed4fc23c4bf0223b77176617b (diff) | |
| parent | bd73f263b310c29d5e0b0dd541403bde44030b86 (diff) | |
| download | rsyslog-75a585a7e26d4d6cf59157cf62584c139af1527c.tar.gz rsyslog-75a585a7e26d4d6cf59157cf62584c139af1527c.tar.xz rsyslog-75a585a7e26d4d6cf59157cf62584c139af1527c.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/msg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 70b20749..ec132489 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -944,13 +944,14 @@ msg_t* MsgDup(msg_t* pOld) pNew->iLenMSG = pOld->iLenMSG; pNew->iLenTAG = pOld->iLenTAG; pNew->iLenHOSTNAME = pOld->iLenHOSTNAME; - if((pOld->msgFlags & NEEDS_DNSRESOL) == 1) { + if((pOld->msgFlags & NEEDS_DNSRESOL)) { localRet = msgSetFromSockinfo(pNew, pOld->rcvFrom.pfrominet); if(localRet != RS_RET_OK) { /* if something fails, we accept loss of this property, it is * better than losing the whole message. */ pNew->msgFlags &= ~NEEDS_DNSRESOL; + pNew->rcvFrom.pRcvFrom = NULL; /* make sure no dangling values */ } } else { if(pOld->rcvFrom.pRcvFrom != NULL) { |