svn commit: r211939 - stable/7/lib/libc/net
Hajimu UMEMOTO
ume at FreeBSD.org
Sat Aug 28 17:12:53 UTC 2010
Author: ume
Date: Sat Aug 28 17:12:52 2010
New Revision: 211939
URL: http://svn.freebsd.org/changeset/base/211939
Log:
MFC r211276:
- When there is no room for returning the result, nss backend
have to return ERANGE and terminate with NS_RETURN.
- When gethostbyname_r(3) and the friends end with an error,
set errno to the value nss backend returns, and return errno
value.
PR: kern/131623
Modified:
stable/7/lib/libc/net/gethostbydns.c
stable/7/lib/libc/net/gethostbyht.c
stable/7/lib/libc/net/gethostbynis.c
stable/7/lib/libc/net/gethostnamadr.c
stable/7/lib/libc/net/getnetbydns.c
stable/7/lib/libc/net/getnetbyht.c
stable/7/lib/libc/net/getnetbynis.c
stable/7/lib/libc/net/getnetnamadr.c
stable/7/lib/libc/net/getproto.c
stable/7/lib/libc/net/getprotoent.c
stable/7/lib/libc/net/getprotoname.c
Modified: stable/7/lib/libc/net/gethostbydns.c
==============================================================================
--- stable/7/lib/libc/net/gethostbydns.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/gethostbydns.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -536,9 +536,12 @@ _dns_gethostbyname(void *rval, void *cb_
return (NS_NOTFOUND);
}
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
+ RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
*((struct hostent **)rval) = hptr;
return (NS_SUCCESS);
}
@@ -683,11 +686,13 @@ _dns_gethostbyaddr(void *rval, void *cb_
he.h_addrtype = AF_INET6;
he.h_length = NS_IN6ADDRSZ;
}
- RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
+ RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
*((struct hostent **)rval) = hptr;
return (NS_SUCCESS);
}
Modified: stable/7/lib/libc/net/gethostbyht.c
==============================================================================
--- stable/7/lib/libc/net/gethostbyht.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/gethostbyht.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
#include <netdb.h>
#include <stdio.h>
#include <ctype.h>
+#include <errno.h>
#include <string.h>
#include <stdarg.h>
#include <nsswitch.h>
@@ -192,8 +193,11 @@ gethostent_r(struct hostent *hptr, char
}
if (gethostent_p(&he, hed, statp->options & RES_USE_INET6, statp) != 0)
return (-1);
- if (__copy_hostent(&he, hptr, buffer, buflen) != 0)
- return (-1);
+ if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
+ *h_errnop = statp->res_h_errno;
+ return ((errno != 0) ? errno : -1);
+ }
*result = hptr;
return (0);
}
@@ -268,8 +272,10 @@ found:
return (NS_NOTFOUND);
}
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct hostent **)rval) = hptr;
return (NS_SUCCESS);
@@ -323,8 +329,10 @@ _ht_gethostbyaddr(void *rval, void *cb_d
if (error != 0)
return (NS_NOTFOUND);
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct hostent **)rval) = hptr;
return (NS_SUCCESS);
Modified: stable/7/lib/libc/net/gethostbynis.c
==============================================================================
--- stable/7/lib/libc/net/gethostbynis.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/gethostbynis.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -288,8 +288,10 @@ _nis_gethostbyname(void *rval, void *cb_
return (NS_NOTFOUND);
}
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct hostent **)rval) = hptr;
return (NS_SUCCESS);
@@ -336,8 +338,10 @@ _nis_gethostbyaddr(void *rval, void *cb_
return (NS_NOTFOUND);
}
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct hostent **)rval) = hptr;
return (NS_SUCCESS);
Modified: stable/7/lib/libc/net/gethostnamadr.c
==============================================================================
--- stable/7/lib/libc/net/gethostnamadr.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/gethostnamadr.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -480,8 +480,12 @@ fakeaddr(const char *name, int af, struc
hed->h_addr_ptrs[0] = (char *)hed->host_addr;
hed->h_addr_ptrs[1] = NULL;
he.h_addr_list = hed->h_addr_ptrs;
+ if (__copy_hostent(&he, hp, buf, buflen) != 0) {
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
+ return (-1);
+ }
RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
- return (__copy_hostent(&he, hp, buf, buflen));
+ return (0);
}
int
@@ -528,7 +532,7 @@ gethostbyname_internal(const char *name,
size_t buflen, struct hostent **result, int *h_errnop, res_state statp)
{
const char *cp;
- int rval, ret_errno;
+ int rval, ret_errno = 0;
char abuf[MAXDNAME];
#ifdef NS_CACHING
@@ -576,7 +580,11 @@ gethostbyname_internal(const char *name,
"gethostbyname2_r", default_src, name, af, hp, buf, buflen,
&ret_errno, h_errnop);
- return ((rval == NS_SUCCESS) ? 0 : -1);
+ if (rval != NS_SUCCESS) {
+ errno = ret_errno;
+ return ((ret_errno != 0) ? ret_errno : -1);
+ }
+ return (0);
}
int
@@ -586,7 +594,7 @@ gethostbyaddr_r(const void *addr, sockle
const u_char *uaddr = (const u_char *)addr;
const struct in6_addr *addr6;
socklen_t size;
- int rval, ret_errno;
+ int rval, ret_errno = 0;
res_state statp;
#ifdef NS_CACHING
@@ -651,7 +659,11 @@ gethostbyaddr_r(const void *addr, sockle
"gethostbyaddr_r", default_src, uaddr, len, af, hp, buf, buflen,
&ret_errno, h_errnop);
- return ((rval == NS_SUCCESS) ? 0 : -1);
+ if (rval != NS_SUCCESS) {
+ errno = ret_errno;
+ return ((ret_errno != 0) ? ret_errno : -1);
+ }
+ return (0);
}
struct hostent *
Modified: stable/7/lib/libc/net/getnetbydns.c
==============================================================================
--- stable/7/lib/libc/net/getnetbydns.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/getnetbydns.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -355,8 +355,10 @@ _dns_getnetbyaddr(void *rval, void *cb_d
net >>= 8;
ne.n_net = net;
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct netent **)rval) = nptr;
return (NS_SUCCESS);
@@ -431,8 +433,10 @@ _dns_getnetbyname(void *rval, void *cb_d
return (NS_NOTFOUND);
}
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct netent **)rval) = nptr;
return (NS_SUCCESS);
Modified: stable/7/lib/libc/net/getnetbyht.c
==============================================================================
--- stable/7/lib/libc/net/getnetbyht.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/getnetbyht.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h>
#include <arpa/inet.h>
#include <arpa/nameser.h>
+#include <errno.h>
#include <netdb.h>
#include <resolv.h>
#include <stdio.h>
@@ -162,8 +163,11 @@ getnetent_r(struct netent *nptr, char *b
}
if (getnetent_p(&ne, ned) != 0)
return (-1);
- if (__copy_netent(&ne, nptr, buffer, buflen) != 0)
- return (-1);
+ if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
+ *h_errnop = statp->res_h_errno;
+ return ((errno != 0) ? errno : -1);
+ }
*result = nptr;
return (0);
}
@@ -226,8 +230,10 @@ found:
return (NS_NOTFOUND);
}
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct netent **)rval) = nptr;
return (NS_SUCCESS);
@@ -272,8 +278,10 @@ _ht_getnetbyaddr(void *rval, void *cb_da
return (NS_NOTFOUND);
}
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct netent **)rval) = nptr;
return (NS_SUCCESS);
Modified: stable/7/lib/libc/net/getnetbynis.c
==============================================================================
--- stable/7/lib/libc/net/getnetbynis.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/getnetbynis.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -160,8 +160,10 @@ _nis_getnetbyname(void *rval, void *cb_d
return (NS_NOTFOUND);
}
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct netent **)rval) = nptr;
return (NS_SUCCESS);
@@ -244,8 +246,10 @@ _nis_getnetbyaddr(void *rval, void *cb_d
return (NS_NOTFOUND);
}
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
+ *errnop = errno;
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct netent **)rval) = nptr;
return (NS_SUCCESS);
Modified: stable/7/lib/libc/net/getnetnamadr.c
==============================================================================
--- stable/7/lib/libc/net/getnetnamadr.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/getnetnamadr.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -360,13 +360,17 @@ getnetbyname_r(const char *name, struct
#endif
{ 0 }
};
- int rval, ret_errno;
+ int rval, ret_errno = 0;
rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS,
"getnetbyname_r", default_src, name, ne, buffer, buflen,
&ret_errno, h_errorp);
- return ((rval == NS_SUCCESS) ? 0 : -1);
+ if (rval != NS_SUCCESS) {
+ errno = ret_errno;
+ return ((ret_errno != 0) ? ret_errno : -1);
+ }
+ return (0);
}
int
@@ -388,13 +392,17 @@ getnetbyaddr_r(uint32_t addr, int af, st
#endif
{ 0 }
};
- int rval, ret_errno;
+ int rval, ret_errno = 0;
rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS,
"getnetbyaddr_r", default_src, addr, af, ne, buffer, buflen,
&ret_errno, h_errorp);
- return ((rval == NS_SUCCESS) ? 0 : -1);
+ if (rval != NS_SUCCESS) {
+ errno = ret_errno;
+ return ((ret_errno != 0) ? ret_errno : -1);
+ }
+ return (0);
}
struct netent *
Modified: stable/7/lib/libc/net/getproto.c
==============================================================================
--- stable/7/lib/libc/net/getproto.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/getproto.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -33,6 +33,7 @@ static char sccsid[] = "@(#)getproto.c 8
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <errno.h>
#include <netdb.h>
#include <nsswitch.h>
#include "netdb_private.h"
@@ -72,7 +73,7 @@ files_getprotobynumber(void *retval, voi
errnop = va_arg(ap, int *);
if ((ped = __protoent_data_init()) == NULL) {
- *errnop = -1;
+ *errnop = errno;
return (NS_NOTFOUND);
}
@@ -83,12 +84,12 @@ files_getprotobynumber(void *retval, voi
if (!ped->stayopen)
__endprotoent_p(ped);
if (error != 0) {
- *errnop = -1;
+ *errnop = errno;
return (NS_NOTFOUND);
}
if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) {
- *errnop = -1;
- return (NS_NOTFOUND);
+ *errnop = errno;
+ return (NS_RETURN);
}
*((struct protoent **)retval) = pptr;
@@ -120,10 +121,11 @@ getprotobynumber_r(int proto, struct pro
rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobynumber_r",
defaultsrc, proto, pptr, buffer, buflen, &ret_errno);
- if (rv == NS_SUCCESS)
- return (0);
- else
- return (ret_errno);
+ if (rv != NS_SUCCESS) {
+ errno = ret_errno;
+ return ((ret_errno != 0) ? ret_errno : -1);
+ }
+ return (0);
}
struct protoent *
Modified: stable/7/lib/libc/net/getprotoent.c
==============================================================================
--- stable/7/lib/libc/net/getprotoent.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/getprotoent.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -424,8 +424,10 @@ files_getprotoent_r(void *retval, void *
buflen = va_arg(ap, size_t);
errnop = va_arg(ap, int *);
- if ((ped = __protoent_data_init()) == NULL)
- return (-1);
+ if ((ped = __protoent_data_init()) == NULL) {
+ *errnop = errno;
+ return (NS_NOTFOUND);
+ }
if (__getprotoent_p(&pe, ped) != 0) {
*errnop = errno;
@@ -434,7 +436,7 @@ files_getprotoent_r(void *retval, void *
if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) {
*errnop = errno;
- return (NS_NOTFOUND);
+ return (NS_RETURN);
}
*((struct protoent **)retval) = pptr;
@@ -490,10 +492,11 @@ getprotoent_r(struct protoent *pptr, cha
rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotoent_r",
defaultsrc, pptr, buffer, buflen, &ret_errno);
- if (rv == NS_SUCCESS)
- return (0);
- else
- return (ret_errno);
+ if (rv != NS_SUCCESS) {
+ errno = ret_errno;
+ return ((ret_errno != 0) ? ret_errno : -1);
+ }
+ return (0);
}
void
Modified: stable/7/lib/libc/net/getprotoname.c
==============================================================================
--- stable/7/lib/libc/net/getprotoname.c Sat Aug 28 17:06:22 2010 (r211938)
+++ stable/7/lib/libc/net/getprotoname.c Sat Aug 28 17:12:52 2010 (r211939)
@@ -33,6 +33,7 @@ static char sccsid[] = "@(#)getprotoname
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <errno.h>
#include <netdb.h>
#include <nsswitch.h>
#include <string.h>
@@ -75,7 +76,7 @@ files_getprotobyname(void *retval, void
if ((ped = __protoent_data_init()) == NULL) {
- *errnop = -1;
+ *errnop = errno;
return (NS_NOTFOUND);
}
@@ -91,12 +92,12 @@ found:
if (!ped->stayopen)
__endprotoent_p(ped);
if (error != 0) {
- *errnop = -1;
+ *errnop = errno;
return (NS_NOTFOUND);
}
if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) {
- *errnop = -1;
- return (NS_NOTFOUND);
+ *errnop = errno;
+ return (NS_RETURN);
}
*((struct protoent **)retval) = pptr;
@@ -128,10 +129,11 @@ getprotobyname_r(const char *name, struc
rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobyname_r",
defaultsrc, name, pptr, buffer, buflen, &ret_errno);
- if (rv == NS_SUCCESS)
- return (0);
- else
- return (ret_errno);
+ if (rv != NS_SUCCESS) {
+ errno = ret_errno;
+ return ((ret_errno != 0) ? ret_errno : -1);
+ }
+ return (0);
}
struct protoent *
More information about the svn-src-stable-7
mailing list