From: Gunnar Beutner Date: Wed, 29 Oct 2014 15:54:33 +0000 (+0100) Subject: Fix Utility::GetFQDN() on OS X X-Git-Tag: v2.2.0~192 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ceca27e25bf3c1db8930c8b366336a11bea1a066;p=icinga2 Fix Utility::GetFQDN() on OS X fixes #7495 --- diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index 14eeb5bb5..d9ab7a154 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -1024,18 +1024,14 @@ String Utility::GetFQDN(void) if (rc != 0) result = NULL; - String canonicalName; - if (result) { if (strcmp(result->ai_canonname, "localhost") != 0) - canonicalName = result->ai_canonname; + hostname = result->ai_canonname; freeaddrinfo(result); - } else { - canonicalName = hostname; } - return canonicalName; + return hostname; } int Utility::Random(void)