mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

* Allow host checking to proceed if no local name was found

merge-requests/1/head
Ilia Sotnikov 2009-03-12 15:54:00 +00:00
rodzic d6bee2dafe
commit 6940d841eb
1 zmienionych plików z 10 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
frontend/saned.c
Wyświetl plik

@ -865,8 +865,10 @@ check_host (int fd)
hints.ai_family = PF_INET;
#endif /* ENABLE_IPV6 */
res = NULL;
err = getaddrinfo (hostname, NULL, &hints, &res);
if (err)
/* Proceed if no local name was found */
if (err && err != EAI_NONAME)
{
DBG (DBG_ERR, "check_host: getaddrinfo failed: %s\n",
gai_strerror (err));
@ -1166,16 +1168,19 @@ check_host (int fd)
/* Get local address */
he = gethostbyname (hostname);
if (!he)
/* Proceed if no local name was found */
if (!he && h_errno != HOST_NOT_FOUND)
{
DBG (DBG_ERR, "check_host: gethostbyname failed: %s\n",
hstrerror (h_errno));
return SANE_STATUS_INVAL;
}
DBG (DBG_DBG, "check_host: local hostname (from DNS): %s\n",
he->h_name);
if (he)
DBG (DBG_DBG, "check_host: local hostname (from DNS): %s\n",
he->h_name);
if ((he->h_length == 4) || he->h_addrtype == AF_INET)
if (he && ((he->h_length == 4) || he->h_addrtype == AF_INET))
{
if (!inet_ntop (he->h_addrtype, he->h_addr_list[0], text_addr,
sizeof (text_addr)))