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

- When there is no room for returning the result, nss backend

Browse Source 
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
MFC after:	2 weeks
This commit is contained in:
Hajimu UMEMOTO 2010-08-13 06:39:54 +00:00
parent 34d9d01f86
commit 225edeac51
11 changed files with 109 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -536,9 +536,12 @@ _dns_gethostbyname(void *rval, void *cb_data, va_list ap)
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) { if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
*((struct hostent **)rval) = hptr; *((struct hostent **)rval) = hptr;
return (NS_SUCCESS); return (NS_SUCCESS);
} }
@ -683,11 +686,13 @@ _dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
he.h_addrtype = AF_INET6; he.h_addrtype = AF_INET6;
he.h_length = NS_IN6ADDRSZ; he.h_length = NS_IN6ADDRSZ;
} }
RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) { if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
*((struct hostent **)rval) = hptr; *((struct hostent **)rval) = hptr;
return (NS_SUCCESS); return (NS_SUCCESS);
} }

16
lib/libc/net/gethostbyht.c
View File

@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
#include <netdb.h> #include <netdb.h>
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h>
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <nsswitch.h> #include <nsswitch.h>
@ -192,8 +193,11 @@ gethostent_r(struct hostent *hptr, char *buffer, size_t buflen,
} }
if (gethostent_p(&he, hed, statp->options & RES_USE_INET6, statp) != 0) if (gethostent_p(&he, hed, statp->options & RES_USE_INET6, statp) != 0)
return (-1); return (-1);
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
return (-1); RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
return ((errno != 0) ? errno : -1);
}
*result = hptr; *result = hptr;
return (0); return (0);
} }
@ -268,8 +272,10 @@ found:
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) { if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct hostent **)rval) = hptr; *((struct hostent **)rval) = hptr;
return (NS_SUCCESS); return (NS_SUCCESS);
@ -323,8 +329,10 @@ _ht_gethostbyaddr(void *rval, void *cb_data, va_list ap)
if (error != 0) if (error != 0)
return (NS_NOTFOUND); return (NS_NOTFOUND);
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) { if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct hostent **)rval) = hptr; *((struct hostent **)rval) = hptr;
return (NS_SUCCESS); return (NS_SUCCESS);

8
lib/libc/net/gethostbynis.c
View File

@ -288,8 +288,10 @@ _nis_gethostbyname(void *rval, void *cb_data, va_list ap)
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) { if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct hostent **)rval) = hptr; *((struct hostent **)rval) = hptr;
return (NS_SUCCESS); return (NS_SUCCESS);
@ -336,8 +338,10 @@ _nis_gethostbyaddr(void *rval, void *cb_data, va_list ap)
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_hostent(&he, hptr, buffer, buflen) != 0) { if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct hostent **)rval) = hptr; *((struct hostent **)rval) = hptr;
return (NS_SUCCESS); return (NS_SUCCESS);

22
lib/libc/net/gethostnamadr.c
View File

@ -480,8 +480,12 @@ fakeaddr(const char *name, int af, struct hostent *hp, char *buf,
hed->h_addr_ptrs[0] = (char *)hed->host_addr; hed->h_addr_ptrs[0] = (char *)hed->host_addr;
hed->h_addr_ptrs[1] = NULL; hed->h_addr_ptrs[1] = NULL;
he.h_addr_list = hed->h_addr_ptrs; 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); RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
return (__copy_hostent(&he, hp, buf, buflen)); return (0);
} }
int int
@ -528,7 +532,7 @@ gethostbyname_internal(const char *name, int af, struct hostent *hp, char *buf,
size_t buflen, struct hostent **result, int *h_errnop, res_state statp) size_t buflen, struct hostent **result, int *h_errnop, res_state statp)
{ {
const char *cp; const char *cp;
int rval, ret_errno; int rval, ret_errno = 0;
char abuf[MAXDNAME]; char abuf[MAXDNAME];
#ifdef NS_CACHING #ifdef NS_CACHING
@ -576,7 +580,11 @@ gethostbyname_internal(const char *name, int af, struct hostent *hp, char *buf,
"gethostbyname2_r", default_src, name, af, hp, buf, buflen, "gethostbyname2_r", default_src, name, af, hp, buf, buflen,
&ret_errno, h_errnop); &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 int
@ -586,7 +594,7 @@ gethostbyaddr_r(const void *addr, socklen_t len, int af, struct hostent *hp,
const u_char *uaddr = (const u_char *)addr; const u_char *uaddr = (const u_char *)addr;
const struct in6_addr *addr6; const struct in6_addr *addr6;
socklen_t size; socklen_t size;
int rval, ret_errno; int rval, ret_errno = 0;
res_state statp; res_state statp;
#ifdef NS_CACHING #ifdef NS_CACHING
@ -651,7 +659,11 @@ gethostbyaddr_r(const void *addr, socklen_t len, int af, struct hostent *hp,
"gethostbyaddr_r", default_src, uaddr, len, af, hp, buf, buflen, "gethostbyaddr_r", default_src, uaddr, len, af, hp, buf, buflen,
&ret_errno, h_errnop); &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 * struct hostent *

8
lib/libc/net/getnetbydns.c
View File

@ -355,8 +355,10 @@ _dns_getnetbyaddr(void *rval, void *cb_data, va_list ap)
net >>= 8; net >>= 8;
ne.n_net = net; ne.n_net = net;
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) { if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct netent **)rval) = nptr; *((struct netent **)rval) = nptr;
return (NS_SUCCESS); return (NS_SUCCESS);
@ -431,8 +433,10 @@ _dns_getnetbyname(void *rval, void *cb_data, va_list ap)
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) { if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct netent **)rval) = nptr; *((struct netent **)rval) = nptr;
return (NS_SUCCESS); return (NS_SUCCESS);

16
lib/libc/net/getnetbyht.c
View File

@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <arpa/nameser.h> #include <arpa/nameser.h>
#include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <resolv.h> #include <resolv.h>
#include <stdio.h> #include <stdio.h>
@ -162,8 +163,11 @@ getnetent_r(struct netent *nptr, char *buffer, size_t buflen,
} }
if (getnetent_p(&ne, ned) != 0) if (getnetent_p(&ne, ned) != 0)
return (-1); return (-1);
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
return (-1); RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno;
return ((errno != 0) ? errno : -1);
}
*result = nptr; *result = nptr;
return (0); return (0);
} }
@ -226,8 +230,10 @@ found:
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) { if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct netent **)rval) = nptr; *((struct netent **)rval) = nptr;
return (NS_SUCCESS); return (NS_SUCCESS);
@ -272,8 +278,10 @@ _ht_getnetbyaddr(void *rval, void *cb_data, va_list ap)
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) { if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct netent **)rval) = nptr; *((struct netent **)rval) = nptr;
return (NS_SUCCESS); return (NS_SUCCESS);

8
lib/libc/net/getnetbynis.c
View File

@ -160,8 +160,10 @@ _nis_getnetbyname(void *rval, void *cb_data, va_list ap)
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) { if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct netent **)rval) = nptr; *((struct netent **)rval) = nptr;
return (NS_SUCCESS); return (NS_SUCCESS);
@ -244,8 +246,10 @@ _nis_getnetbyaddr(void *rval, void *cb_data, va_list ap)
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_netent(&ne, nptr, buffer, buflen) != 0) { if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
*errnop = errno;
RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
*h_errnop = statp->res_h_errno; *h_errnop = statp->res_h_errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct netent **)rval) = nptr; *((struct netent **)rval) = nptr;
return (NS_SUCCESS); return (NS_SUCCESS);

16
lib/libc/net/getnetnamadr.c
View File

@ -360,13 +360,17 @@ getnetbyname_r(const char *name, struct netent *ne, char *buffer,
#endif #endif
{ 0 } { 0 }
}; };
int rval, ret_errno; int rval, ret_errno = 0;
rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS, rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS,
"getnetbyname_r", default_src, name, ne, buffer, buflen, "getnetbyname_r", default_src, name, ne, buffer, buflen,
&ret_errno, h_errorp); &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 int
@ -388,13 +392,17 @@ getnetbyaddr_r(uint32_t addr, int af, struct netent *ne, char *buffer,
#endif #endif
{ 0 } { 0 }
}; };
int rval, ret_errno; int rval, ret_errno = 0;
rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS, rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS,
"getnetbyaddr_r", default_src, addr, af, ne, buffer, buflen, "getnetbyaddr_r", default_src, addr, af, ne, buffer, buflen,
&ret_errno, h_errorp); &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 * struct netent *

18
lib/libc/net/getproto.c
View File

@ -33,6 +33,7 @@ static char sccsid[] = "@(#)getproto.c 8.1 (Berkeley) 6/4/93";
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <nsswitch.h> #include <nsswitch.h>
#include "netdb_private.h" #include "netdb_private.h"
@ -72,7 +73,7 @@ files_getprotobynumber(void *retval, void *mdata, va_list ap)
errnop = va_arg(ap, int *); errnop = va_arg(ap, int *);
if ((ped = __protoent_data_init()) == NULL) { if ((ped = __protoent_data_init()) == NULL) {
*errnop = -1; *errnop = errno;
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
@ -83,12 +84,12 @@ files_getprotobynumber(void *retval, void *mdata, va_list ap)
if (!ped->stayopen) if (!ped->stayopen)
__endprotoent_p(ped); __endprotoent_p(ped);
if (error != 0) { if (error != 0) {
*errnop = -1; *errnop = errno;
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) { if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) {
*errnop = -1; *errnop = errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct protoent **)retval) = pptr; *((struct protoent **)retval) = pptr;
@ -120,10 +121,11 @@ getprotobynumber_r(int proto, struct protoent *pptr, char *buffer,
rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobynumber_r", rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobynumber_r",
defaultsrc, proto, pptr, buffer, buflen, &ret_errno); defaultsrc, proto, pptr, buffer, buflen, &ret_errno);
if (rv == NS_SUCCESS) if (rv != NS_SUCCESS) {
return (0); errno = ret_errno;
else return ((ret_errno != 0) ? ret_errno : -1);
return (ret_errno); }
return (0);
} }
struct protoent * struct protoent *

17
lib/libc/net/getprotoent.c
View File

@ -424,8 +424,10 @@ files_getprotoent_r(void *retval, void *mdata, va_list ap)
buflen = va_arg(ap, size_t); buflen = va_arg(ap, size_t);
errnop = va_arg(ap, int *); errnop = va_arg(ap, int *);
if ((ped = __protoent_data_init()) == NULL) if ((ped = __protoent_data_init()) == NULL) {
return (-1); *errnop = errno;
return (NS_NOTFOUND);
}
if (__getprotoent_p(&pe, ped) != 0) { if (__getprotoent_p(&pe, ped) != 0) {
*errnop = errno; *errnop = errno;
@ -434,7 +436,7 @@ files_getprotoent_r(void *retval, void *mdata, va_list ap)
if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) { if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) {
*errnop = errno; *errnop = errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct protoent **)retval) = pptr; *((struct protoent **)retval) = pptr;
@ -490,10 +492,11 @@ getprotoent_r(struct protoent *pptr, char *buffer, size_t buflen,
rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotoent_r", rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotoent_r",
defaultsrc, pptr, buffer, buflen, &ret_errno); defaultsrc, pptr, buffer, buflen, &ret_errno);
if (rv == NS_SUCCESS) if (rv != NS_SUCCESS) {
return (0); errno = ret_errno;
else return ((ret_errno != 0) ? ret_errno : -1);
return (ret_errno); }
return (0);
} }
void void

18
lib/libc/net/getprotoname.c
View File

@ -33,6 +33,7 @@ static char sccsid[] = "@(#)getprotoname.c 8.1 (Berkeley) 6/4/93";
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <errno.h>
#include <netdb.h> #include <netdb.h>
#include <nsswitch.h> #include <nsswitch.h>
#include <string.h> #include <string.h>
@ -75,7 +76,7 @@ files_getprotobyname(void *retval, void *mdata, va_list ap)
if ((ped = __protoent_data_init()) == NULL) { if ((ped = __protoent_data_init()) == NULL) {
*errnop = -1; *errnop = errno;
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
@ -91,12 +92,12 @@ found:
if (!ped->stayopen) if (!ped->stayopen)
__endprotoent_p(ped); __endprotoent_p(ped);
if (error != 0) { if (error != 0) {
*errnop = -1; *errnop = errno;
return (NS_NOTFOUND); return (NS_NOTFOUND);
} }
if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) { if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) {
*errnop = -1; *errnop = errno;
return (NS_NOTFOUND); return (NS_RETURN);
} }
*((struct protoent **)retval) = pptr; *((struct protoent **)retval) = pptr;
@ -128,10 +129,11 @@ getprotobyname_r(const char *name, struct protoent *pptr, char *buffer,
rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobyname_r", rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobyname_r",
defaultsrc, name, pptr, buffer, buflen, &ret_errno); defaultsrc, name, pptr, buffer, buflen, &ret_errno);
if (rv == NS_SUCCESS) if (rv != NS_SUCCESS) {
return (0); errno = ret_errno;
else return ((ret_errno != 0) ? ret_errno : -1);
return (ret_errno); }
return (0);
} }
struct protoent * struct protoent *