From: Louis Bouchard <louis.bouchard@canonical.com>
Date: Wed, 17 Apr 2013 06:52:17 +0000 (+0200)
Subject: bugfix:  $PreserveFQDN is not properly working
X-Git-Url: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=89ace1e401dc179a20ec283c2f7c2f80becf4700

bugfix:  $PreserveFQDN is not properly working

Origin: http://git.adiscon.com/?p=rsyslog.git;a=commitdiff_plain;h=89ace1e401dc179a20ec283c2f7c2f80becf4700
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=426
Bug-Ubuntu: http://bugs.launchpad.net/bugs/1022545
---

--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2418,6 +2418,13 @@
 	 */
 	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;
