summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-04-16 19:05:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-04-16 19:05:11 +0200
commitfba7f66590c6c60c1c08585d210734884654c912 (patch)
treee6e65a55d2eb0ae49f3015901494555918e79127
parent7a8b99ebe9a0aea956f44fbe6e584597445b6a7a (diff)
downloadrsyslog-fba7f66590c6c60c1c08585d210734884654c912.tar.gz
rsyslog-fba7f66590c6c60c1c08585d210734884654c912.tar.xz
rsyslog-fba7f66590c6c60c1c08585d210734884654c912.zip
bugfix/imuxsock: configured hostname was not used
-rw-r--r--ChangeLog3
-rw-r--r--plugins/imuxsock/imuxsock.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d9491ca6..28ab327a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
---------------------------------------------------------------------------
Version 6.3.9 [DEVEL] 2012-04-??
-- bugfix/imuxsock: solving abort if hostname was not set
+- bugfix/imuxsock: solving abort if hostname was not set; configured
+ hostname was not used (both merge regressions)
---------------------------------------------------------------------------
Version 6.3.8 [DEVEL] 2012-04-16
- added $PStatJSON directive to permit stats records in JSON format
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 1c8a05e5..2d26e652 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -331,6 +331,7 @@ static rsRetVal addInstance(void __attribute__((unused)) *pVal, uchar *pNewVal)
CHKmalloc(inst = MALLOC(sizeof(instanceConf_t)));
inst->sockName = pNewVal;
inst->ratelimitInterval = cs.ratelimitInterval;
+ inst->pLogHostName = cs.pLogHostName;
inst->ratelimitBurst = cs.ratelimitBurst;
inst->ratelimitSeverity = cs.ratelimitSeverity;
inst->bUseFlowCtl = cs.bUseFlowCtl;