diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 08:09:11 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 08:09:11 +0200 |
commit | 67598c226cf9236b42096648943e4494cf15fd77 (patch) | |
tree | 7232e5be50028c8a46c58a1a2496c87968ee09c3 | |
parent | e544df3f3910270463a9215b87f8624cc5153402 (diff) | |
parent | d4690ae053b1b26fd215485f08875d508d7c4eba (diff) | |
download | rsyslog-67598c226cf9236b42096648943e4494cf15fd77.tar.gz rsyslog-67598c226cf9236b42096648943e4494cf15fd77.tar.bz2 rsyslog-67598c226cf9236b42096648943e4494cf15fd77.zip |
Merge branch 'v6-stable' into v6-beta
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | plugins/imuxsock/imuxsock.c | 5 |
2 files changed, 1 insertions, 5 deletions
@@ -76,6 +76,7 @@ Version 6.4.3 [V6-STABLE] 2012-??-?? closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 This happend to filters of the style "local0,local1.*", where the multiple facilities were comma-separated. +- bugfix: imuxsock did not properly honor $LocalHostIPIF --------------------------------------------------------------------------- Version 6.4.2 [V6-STABLE] 2012-09-20 - bugfix: potential abort, if action queue could not be properly started diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 0802dbb0..1cb367b0 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -1581,11 +1581,6 @@ CODEmodInit_QueryRegCFSLineHdlr listeners[i].fd = -1; } - /* now init listen socket zero, the local log socket */ - 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 *)"inputunixlistensocketignoremsgtimestamp", 0, eCmdHdlrBinary, NULL, &cs.bIgnoreTimestamp, STD_LOADABLE_MODULE_ID)); |