summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-15 16:10:32 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-15 16:10:32 +0200
commit8985d50fea62e1794c8e1a12d09733007869a6b4 (patch)
treecdf842e4d51cd7cfbd4d1fbe635326781817aa1f /tools/syslogd.c
parent0620fc5780fabdfb160524197fd4aa6bb22613e9 (diff)
parent33acb956db2824a118656021d873143ff1475321 (diff)
downloadrsyslog-8985d50fea62e1794c8e1a12d09733007869a6b4.tar.gz
rsyslog-8985d50fea62e1794c8e1a12d09733007869a6b4.tar.xz
rsyslog-8985d50fea62e1794c8e1a12d09733007869a6b4.zip
Merge branch 'v5-stable' into v5-beta
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r--tools/syslogd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 9a331a83..63fffbfa 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2217,6 +2217,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