diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-22 12:22:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-22 12:22:30 +0100 |
| commit | 8f61bf333cc900d0a963ffe0f98a256681aff990 (patch) | |
| tree | 85d5cfa1bcfa53a39de1db2b985e6045129c21ca | |
| parent | 591c9bbbf8e9929cd7bb550725ece50cdb06f179 (diff) | |
| parent | e95584a204016c87daec0f5bee0f3f794bbba38c (diff) | |
| download | rsyslog-8f61bf333cc900d0a963ffe0f98a256681aff990.tar.gz rsyslog-8f61bf333cc900d0a963ffe0f98a256681aff990.tar.bz2 rsyslog-8f61bf333cc900d0a963ffe0f98a256681aff990.zip | |
Merge branch 'v6-stable' into tmp
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -254,6 +254,9 @@ Version 6.6.1 [v6-stable] 2012-10-?? ... actually, they are microseconds. So the fractional part of the timestamp was not properly formatted. Thanks to Marius Tomaschewski for the bug report and the patch idea. +- bugfix: hostname set in rsyslog.conf was not picked up until HUP + which could also mean "never" or "not for a very long time". + Thanks to oxpa for providing analysis and a patch --------------------------------------------------------------------------- Version 6.6.0 [v6-stable] 2012-10-22 This starts a new stable branch, based on the 6.5.x series, plus: diff --git a/tools/syslogd.c b/tools/syslogd.c index a3cbc799..5882b570 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2032,6 +2032,8 @@ int realMain(int argc, char **argv) } localRet = rsconf.Load(&ourConf, ConfFile); + queryLocalHostname(); /* need to re-query to pick up a changed hostname due to config */ + if(localRet == RS_RET_NONFATAL_CONFIG_ERR) { if(loadConf->globals.bAbortOnUncleanConfig) { fprintf(stderr, "rsyslogd: $AbortOnUncleanConfig is set, and config is not clean.\n" |