diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 15:29:20 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 15:29:20 +0100 |
| commit | 699d0d933ab64941d40df17c69b2c377231924cf (patch) | |
| tree | 07aa41cd80cc27f052bb92e856fd088d32301d10 /tools | |
| parent | 06bad730521dc476a7eabbbedf624a4cfbf65b18 (diff) | |
| download | rsyslog-699d0d933ab64941d40df17c69b2c377231924cf.tar.gz rsyslog-699d0d933ab64941d40df17c69b2c377231924cf.tar.xz rsyslog-699d0d933ab64941d40df17c69b2c377231924cf.zip | |
added $LocalHostName config directive & some bugfixing
- added $LocalHostName config directive
- bugfix: local hostname was pulled too-early, so that some config
directives (namely FQDN settings) did not have any effect
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 5f8d45a8..058d75d8 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2302,6 +2302,9 @@ init() legacyOptsHook(); + /* re-generate local host name property, as the config may have changed our FQDN settings */ + glbl.GenerateLocalHostNameProperty(); + /* we are now done with reading the configuration. This is the right time to * free some objects that were just needed for loading it. rgerhards 2005-10-19 */ @@ -3566,9 +3569,6 @@ int realMain(int argc, char **argv) if(!iConfigVerify) CHKiRet(doGlblProcessInit()); - /* re-generate local host name property, as the config may have changed our FQDN settings */ - glbl.GenerateLocalHostNameProperty(); - CHKiRet(mainThread()); /* do any de-init's that need to be done AFTER this comment */ |