diff options
| author | Louis Bouchard <louis.bouchard@canonical.com> | 2013-04-17 08:52:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-17 08:52:17 +0200 |
| commit | 89ace1e401dc179a20ec283c2f7c2f80becf4700 (patch) | |
| tree | 09b4120f4e3a0cb1f0ba5eb8844e6a6ce0a943ac /tools/syslogd.c | |
| parent | 15fc65f35079bdac64c48e9ae37833785a6d379d (diff) | |
| download | rsyslog-89ace1e401dc179a20ec283c2f7c2f80becf4700.tar.gz rsyslog-89ace1e401dc179a20ec283c2f7c2f80becf4700.tar.bz2 rsyslog-89ace1e401dc179a20ec283c2f7c2f80becf4700.zip | |
bugfix: $PreserveFQDN is not properly working
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=426
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 7 |
1 files changed, 7 insertions, 0 deletions
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; |