diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | tools/syslogd.c | 7 |
2 files changed, 10 insertions, 0 deletions
@@ -5,6 +5,9 @@ Version 7.3.10 [devel] 2013-04-?? - added support for encrypting log files - bugfix: imuxsock aborted under some conditions regression from ratelimiting enhancements +- bugfix: $PreserveFQDN is not properly working + Thanks to Louis Bouchard for the patch + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=426 --------------------------------------------------------------------------- Version 7.3.9 [devel] 2013-03-27 - support for signing logs added diff --git a/tools/syslogd.c b/tools/syslogd.c index e291ba47..fe1205dd 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1528,6 +1528,13 @@ queryLocalHostname(void) */ glbl.SetLocalHostName(LocalHostName); glbl.SetLocalDomain(LocalDomain); + + if ( strlen((char*)LocalDomain) ) { + CHKmalloc(LocalFQDNName = (uchar*)malloc(strlen((char*)LocalDomain)+strlen((char*)LocalHostName)+1)); + if ( sprintf((char*)LocalFQDNName,"%s.%s",(char*)LocalHostName,(char*)LocalDomain) ) + glbl.SetLocalFQDNName(LocalFQDNName); + } + glbl.GenerateLocalHostNameProperty(); /* must be redone after conf processing, FQDN setting may have changed */ finalize_it: RETiRet; |