summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-15 16:12:42 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-15 16:12:42 +0200
commit6ce405a13e6d4722c33cd6dcce618ee3853df6a9 (patch)
tree8ddfcbc5ddbb9970179ed6854a0c2063ece5c31d /tools
parent50521ab72bcf302958b007ca77f08ce65a368fb8 (diff)
parent33acb956db2824a118656021d873143ff1475321 (diff)
downloadrsyslog-6ce405a13e6d4722c33cd6dcce618ee3853df6a9.tar.gz
rsyslog-6ce405a13e6d4722c33cd6dcce618ee3853df6a9.tar.xz
rsyslog-6ce405a13e6d4722c33cd6dcce618ee3853df6a9.zip
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'tools')
-rw-r--r--tools/syslogd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 9e4b92fe..5e9d070d 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2195,6 +2195,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