diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 15:11:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 15:11:50 +0200 |
| commit | 7177afe484e5ded6b0d65d19e18489cdacfeb0fa (patch) | |
| tree | 721b623150baa67e9254d9176eac04773a395e9b /plugins/imuxsock/imuxsock.c | |
| parent | e2978cd396551280274bd7a17ec3034e4a0dab9e (diff) | |
| parent | 80d62d6bb7fe19c50f10732f98c8de90094845b0 (diff) | |
| download | rsyslog-7177afe484e5ded6b0d65d19e18489cdacfeb0fa.tar.gz rsyslog-7177afe484e5ded6b0d65d19e18489cdacfeb0fa.tar.xz rsyslog-7177afe484e5ded6b0d65d19e18489cdacfeb0fa.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
tools/syslogd.c
Diffstat (limited to 'plugins/imuxsock/imuxsock.c')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 4a7e7b42..ca762d64 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -379,8 +379,7 @@ addListner(instanceConf_t *inst) } CHKiRet(prop.Construct(&(listeners[nfd].hostName))); if(inst->pLogHostName == NULL) { - CHKiRet(prop.SetString(listeners[nfd].hostName, glbl.GetLocalHostName(), - ustrlen(glbl.GetLocalHostName()))); + listeners[nfd].hostName = NULL; } else { CHKiRet(prop.SetString(listeners[nfd].hostName, inst->pLogHostName, ustrlen(inst->pLogHostName))); } @@ -864,7 +863,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim pMsg->msgFlags = pLstn->flags; } - MsgSetRcvFrom(pMsg, pLstn->hostName); + MsgSetRcvFrom(pMsg, pLstn->hostName == NULL ? glbl.GetLocalHostNameProp() : pLstn->hostName); CHKiRet(MsgSetRcvFromIP(pMsg, pLocalHostIP)); CHKiRet(submitMsg(pMsg)); @@ -1297,9 +1296,9 @@ CODEmodInit_QueryRegCFSLineHdlr } /* now init listen socket zero, the local log socket */ - CHKiRet(prop.Construct(&(listeners[0].hostName))); - CHKiRet(prop.SetString(listeners[0].hostName, glbl.GetLocalHostName(), ustrlen(glbl.GetLocalHostName()))); - CHKiRet(prop.ConstructFinalize(listeners[0].hostName)); + CHKiRet(prop.Construct(&pLocalHostIP)); + CHKiRet(prop.SetString(pLocalHostIP, UCHAR_CONSTANT("127.0.0.1"), sizeof("127.0.0.1") - 1)); + CHKiRet(prop.ConstructFinalize(pLocalHostIP)); /* register config file handlers */ CHKiRet(omsdRegCFSLineHdlr((uchar *)"omitlocallogging", 0, eCmdHdlrBinary, |