picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

socket-util: use IP address when hostname is not found

Browse source 
socknameinfo_pretty() would fail for addresses without reverse DNS,
but we do not want that to happen.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-10-21 23:20:59 -04:00
parent a7736b14de
commit cb6518345f
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/shared/socket-util.c
View file

@ -633,20 +633,20 @@ int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret)
r = getnameinfo(&sa->sa, salen, host, sizeof(host), NULL, 0,
NI_IDN|NI_IDN_USE_STD3_ASCII_RULES);
if (r != 0) {
_cleanup_free_ char *sockname = NULL;
int saved_errno = errno;
r = sockaddr_pretty(&sa->sa, salen, true, &sockname);
if (r < 0)
r = sockaddr_pretty(&sa->sa, salen, true, &ret);
if (r < 0) {
log_error("sockadd_pretty() failed: %s", strerror(-r));
else
log_error("getnameinfo(%s) failed: %s", sockname, strerror(-r));
return -saved_errno;
}
return r;
}
ret = strdup(host);
if (!ret)
return log_oom();
log_debug("getnameinfo(%s) failed: %s", ret, strerror(saved_errno));
} else {
ret = strdup(host);
if (!ret)
return log_oom();
}
*_ret = ret;
return 0;