summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-19 08:10:24 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-19 08:10:24 +0200
commitf2e64772488170f21c333cc0bfcf5f289007f457 (patch)
treea82604c6be5a4846ae3d589622be290a0fbb6d89
parent9a9c88a31abd139889bacee0f58b949c278ffdb2 (diff)
parentd4690ae053b1b26fd215485f08875d508d7c4eba (diff)
downloadrsyslog-f2e64772488170f21c333cc0bfcf5f289007f457.tar.gz
rsyslog-f2e64772488170f21c333cc0bfcf5f289007f457.tar.xz
rsyslog-f2e64772488170f21c333cc0bfcf5f289007f457.zip
Merge branch 'v6-stable' into beta
-rw-r--r--ChangeLog1
-rw-r--r--plugins/imuxsock/imuxsock.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e481a25..2e5196f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -207,6 +207,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 79d8c5d0..d5e4bb31 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -1552,11 +1552,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));