GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unbreak own hostname qualification on POSIX systems

Browse Source 
Partial revert commit v0.9.2-6-g9a3d6880 (issue #160), because
invoking getaddrinfo(NULL, ... AI_CANONNAME) is illegal and never
succeeds.
This commit is contained in:
Jan Engelhardt 2019-02-06 23:43:18 +01:00
parent 414661858d
commit e1faa92593
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vmime/platforms/posix/posixHandler.cpp
View File

@ -159,6 +159,10 @@ static inline bool isAcceptableHostname(const vmime::string& str) {
const vmime::string posixHandler::getHostName() const { const vmime::string posixHandler::getHostName() const {
char hostname[256];
::gethostname(hostname, sizeof(hostname));
hostname[sizeof(hostname)-1] = '\0';
// Try to get official canonical name of this host // Try to get official canonical name of this host
struct addrinfo hints; struct addrinfo hints;
@ -169,8 +173,7 @@ const vmime::string posixHandler::getHostName() const {
struct addrinfo* info; struct addrinfo* info;
if (getaddrinfo(NULL, "http", &hints, &info) == 0) { if (getaddrinfo(hostname, "http", &hints, &info) == 0) {
// First, try to get a Fully-Qualified Domain Name (FQDN) // First, try to get a Fully-Qualified Domain Name (FQDN)
for (struct addrinfo* p = info ; p != NULL ; p = p->ai_next) { for (struct addrinfo* p = info ; p != NULL ; p = p->ai_next) {
@ -202,11 +205,6 @@ const vmime::string posixHandler::getHostName() const {
freeaddrinfo(info); freeaddrinfo(info);
} }
// Get host name
char hostname[256];
::gethostname(hostname, sizeof(hostname));
hostname[sizeof(hostname) - 1] = '\0';
if (::strlen(hostname) == 0 || !isAcceptableHostname(hostname)) { if (::strlen(hostname) == 0 || !isAcceptableHostname(hostname)) {
::strcpy(hostname, "localhost.localdomain"); ::strcpy(hostname, "localhost.localdomain");
} }