d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct the return code from _dns_gethostby*() to correspond

Browse Source 
with h_errno.

Obtained from:	NetBSD
MFC after:	2 weeks
This commit is contained in:
Hajimu UMEMOTO 2010-08-15 16:28:08 +00:00
parent 4816a1d1e4
commit 2db99256b1
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libc/net/gethostbydns.c
View File

@ -522,18 +522,26 @@ _dns_gethostbyname(void *rval, void *cb_data, va_list ap)
free(buf);
dprintf("res_nsearch failed (%d)\n", n, statp);
*h_errnop = statp->res_h_errno;
return (0);
return (NS_NOTFOUND);
} else if (n > sizeof(buf->buf)) {
free(buf);
dprintf("static buffer is too small (%d)\n", n, statp);
*h_errnop = statp->res_h_errno;
return (0);
return (NS_UNAVAIL);
}
error = gethostanswer(buf, n, name, type, &he, hed, statp);
free(buf);
if (error != 0) {
*h_errnop = statp->res_h_errno;
return (NS_NOTFOUND);
switch (statp->res_h_errno) {
case HOST_NOT_FOUND:
return (NS_NOTFOUND);
case TRY_AGAIN:
return (NS_TRYAGAIN);
default:
return (NS_UNAVAIL);
}
/*NOTREACHED*/
}
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
*errnop = errno;
@ -632,7 +640,15 @@ _dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
if (gethostanswer(buf, n, qbuf, T_PTR, &he, hed, statp) != 0) {
free(buf);
*h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); /* h_errno was set by gethostanswer() */
switch (statp->res_h_errno) {
case HOST_NOT_FOUND:
return (NS_NOTFOUND);
case TRY_AGAIN:
return (NS_TRYAGAIN);
default:
return (NS_UNAVAIL);
}
/*NOTREACHED*/
}
free(buf);
#ifdef SUNSECURITY