maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix GetFullyQualifiedName() (#1915)

Browse source 
Don't expect GetComputerName() (hostname) and FQDN to be the same. They
may not be!
This commit is contained in:
Andy Schwartzmeyer 2016-08-18 15:25:47 -07:00 committed by Mike Richmond
parent e7a6b314fc
commit 550a21e40e
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/libpsl-native/test/test-getfullyqualifiedname.cpp
View file

@ -13,25 +13,18 @@
TEST(GetFullyQualifiedNameTest, ValidateLinuxGetFullyQualifiedDomainName)
{
std::string actual(GetFullyQualifiedName());
std::string hostname(GetComputerName());
// FQDN starts with hostname (which may be fully qualified)
EXPECT_LE(hostname, actual);
struct addrinfo hints, *info;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_CANONNAME;
EXPECT_FALSE(getaddrinfo(hostname.c_str(), "http", &hints, &info));
// hostname did not include domain name, so test it separately
if (hostname < actual)
{
struct addrinfo hints, *info;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_CANONNAME;
EXPECT_FALSE(getaddrinfo(hostname.c_str(), "http", &hints, &info));
// Compare canonical name to FQDN
EXPECT_STREQ(info->ai_canonname, actual.c_str());
// Compare canonical name to FQDN
EXPECT_STREQ(info->ai_canonname, actual.c_str());
freeaddrinfo(info);
freeaddrinfo(info);
}
}