summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-12 13:58:13 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-12 13:58:13 +0200
commitdec9bcfe2a869b0f70b5f2a18e08a0322ebf5517 (patch)
tree587517a42ec1c3f2cb93f3417710132b8681425f
parent3ebbb9c4bbfe5d4a815861afde28df47d35b022e (diff)
downloadrsyslog-dec9bcfe2a869b0f70b5f2a18e08a0322ebf5517.tar.gz
rsyslog-dec9bcfe2a869b0f70b5f2a18e08a0322ebf5517.tar.bz2
rsyslog-dec9bcfe2a869b0f70b5f2a18e08a0322ebf5517.zip
bugfix "$PreserveFQDN on" was not honored in some modules
Thanks to bodik for reporting this bug. ---------------------------------------------
-rw-r--r--ChangeLog2
-rw-r--r--tools/syslogd.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index aaef8989..c72582db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
Version 5.8.13 [V5-stable] 2012-06-??
- bugfix: "last message repeated n times" message was missing hostname
Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
+- bugfix "$PreserveFQDN on" was not honored in some modules
+ Thanks to bodik for reporting this bug.
---------------------------------------------------------------------------
Version 5.8.12 [V5-stable] 2012-06-06
- add small delay (50ms) after sending shutdown message
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 0988d462..cbbb66bc 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2200,6 +2200,7 @@ static rsRetVal mainThread()
if(myPid != ppid)
kill(ppid, SIGTERM);
+ glbl.GenerateLocalHostNameProperty(); /* regenerate, FQDN setting may have changed */
/* If instructed to do so, we now drop privileges. Note that this is not 100% secure,
* because outputs are already running at this time. However, we can implement