tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure that Utility::GetHostName() returns an FQDN. 

Fixes #6312
This commit is contained in:
Gunnar Beutner 2014-05-26 17:32:18 +02:00
parent e813000d4f
commit 3f2df5b656
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/base/utility.cpp
View File

@ -22,6 +22,7 @@
#include "base/application.hpp" #include "base/application.hpp"
#include "base/logger_fwd.hpp" #include "base/logger_fwd.hpp"
#include "base/exception.hpp" #include "base/exception.hpp"
#include "base/socket.hpp"
#include <mmatch.h> #include <mmatch.h>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
@ -977,14 +978,42 @@ int Utility::CompareVersion(const String& v1, const String& v2)
return 0; return 0;
} }
/**
* Returns the fully-qualified domain name for the host
* we're running on.
*
* @returns The FQDN.
*/
String Utility::GetHostName(void) String Utility::GetHostName(void)
{ {
char name[255]; char name[255];
if (gethostname(name, sizeof(name)) < 0) if (gethostname(name, sizeof(name)) < 0) {
strcpy(name, "<unknown host>"); return "localhost";
}
return String(name); addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM;
hints.ai_flags = AI_CANONNAME;
addrinfo *result;
int rc = getaddrinfo(name, NULL, &hints, &result);
if (rc < 0)
result = NULL;
String canonicalName;
if (result && strcmp(result->ai_canonname, "localhost") != 0) {
canonicalName = result->ai_canonname;
freeaddrinfo(result);
} else {
canonicalName = name;
}
return canonicalName;
} }
int Utility::Random(void) int Utility::Random(void)