Date: Tue, 20 Jun 2006 16:47:11 GMT From: Michael Bushkov <bushman@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 99676 for review Message-ID: <200606201647.k5KGlBSH046087@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=99676 Change 99676 by bushman@bushman_nss_ldap_cached on 2006/06/20 16:46:52 Lots of minor fixes, that allow modules to be compiled as the part of the libc library. Still there's a need to integrate them only in libc.a. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/Makefile#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/netdb_private.h#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nsdispatch.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/copyhtent.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/gr_scan.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/servunpack.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_group.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_passwd.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_serv.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/nss_compat.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_group.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_addrinfo.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_namadr.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_name6.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_net.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_passwd.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/nss_dns.c#6 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_group.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_addrinfo.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_namadr.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_name6.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_net.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_passwd.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_proto.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_rpc.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_serv.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_shells.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.c#8 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_group.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_addrinfo.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_namadr.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_name6.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_net.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_passwd.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_rpc.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_serv.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nss_nis.c#5 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/Makefile#3 (text+ko) ==== @@ -113,8 +113,7 @@ # Include nss-modules's sources so that statically linked apps can work # normally -CFLAGS+= -I${.CURDIR}/../libnssutil -CFLAGS+= -I${.CURDIR/include -I${.CURDIR/net +CFLAGS+= -I${.CURDIR}/../libnssutil -I${.CURDIR}/net .PATH: ${.CURDIR}/../libnssutil .include "${.CURDIR}/../libnssutil/Makefile.inc" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/netdb_private.h#6 (text+ko) ==== @@ -109,8 +109,6 @@ char data[sizeof(struct protoent_data)]; }; -struct protodata *__protodata_init(void); - void _map_v4v6_address(const char *, char *); void _map_v4v6_hostent(struct hostent *, char **, char *); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nsdispatch.c#3 (text+ko) ==== @@ -437,7 +437,7 @@ */ /* The built-in NSS modules are all loaded at once. */ #define NSS_BACKEND(name, reg) \ -ns_mtab *reg(unsigned int *, nss_module_unregister_fn *); +ns_mtab *reg(const char *, unsigned int *, nss_module_unregister_fn *); #include "nss_backends.h" #undef NSS_BACKEND ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/copyhtent.c#3 (text+ko) ==== @@ -21,6 +21,9 @@ #include <sys/param.h> #include <netdb.h> #include <errno.h> +#include <stdlib.h> +#include <string.h> + int __copy_hostent(struct hostent *he, struct hostent *hptr, char *buf, ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/gr_scan.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <ctype.h> #include <err.h> #include <errno.h> #include <fcntl.h> ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/servunpack.c#2 (text+ko) ==== @@ -31,10 +31,12 @@ * SUCH DAMAGE. */ +#include <arpa/inet.h> #include <sys/param.h> #include <sys/types.h> #include <errno.h> #include <netdb.h> +#include <stdlib.h> #include <string.h> int ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_group.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <ctype.h> #include <errno.h> @@ -113,7 +114,7 @@ else if (stayopen) st->fp = fopen(_PATH_GROUP, "r"); set_setent(dtab, mdata); - (void)nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "setgrent", + (void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "setgrent", compatsrc, 0); break; case nss_end_ent: @@ -122,7 +123,7 @@ st->fp = NULL; } set_setent(dtab, mdata); - (void)nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "endgrent", + (void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "endgrent", compatsrc, 0); break; default: @@ -206,17 +207,17 @@ set_lookup_type(dtab, how); switch (how) { case nss_lt_all: - rv = nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT, + rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT, "getgrent_r", compatsrc, grp, buffer, bufsize, errnop); break; case nss_lt_id: - rv = nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT, + rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT, "getgrgid_r", compatsrc, gid, grp, buffer, bufsize, errnop); break; case nss_lt_name: - rv = nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT, + rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT, "getgrnam_r", compatsrc, name, grp, buffer, bufsize, errnop); break; @@ -227,7 +228,7 @@ break; case COMPAT_MODE_NAME: set_lookup_type(dtab, nss_lt_name); - rv = nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT, + rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT, "getgrnam_r", compatsrc, st->name, grp, buffer, bufsize, errnop); switch (rv) { ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_passwd.c#3 (text+ko) ==== @@ -34,8 +34,9 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" +#include <arpa/inet.h> #include <sys/param.h> -#include <db.h> #include <errno.h> #include <fcntl.h> #include <netdb.h> @@ -48,6 +49,8 @@ #include <string.h> #include <syslog.h> #include <unistd.h> +#include "un-namespace.h" +#include <db.h> #include "nss_tls.h" #include "nss_compat.h" #include "pw_scan.h" @@ -418,17 +421,17 @@ pwd_init(pwd); switch (lookup_how) { case nss_lt_all: - rv = nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT, + rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT, "getpwent_r", compatsrc, pwd, buffer, bufsize, errnop); break; case nss_lt_id: - rv = nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT, + rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT, "getpwuid_r", compatsrc, uid, pwd, buffer, bufsize, errnop); break; case nss_lt_name: - rv = nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT, + rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT, "getpwnam_r", compatsrc, lookup_name, pwd, buffer, bufsize, errnop); break; @@ -560,7 +563,7 @@ st->db = pwdbopen(&st->version); st->stayopen = stayopen; set_setent(dtab, mdata); - (void)nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "setpwent", + (void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "setpwent", compatsrc, 0); break; case nss_end_ent: @@ -569,7 +572,7 @@ st->db = NULL; } set_setent(dtab, mdata); - (void)nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "endpwent", + (void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "endpwent", compatsrc, 0); break; default: ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/compat_serv.c#2 (text+ko) ==== @@ -25,8 +25,10 @@ * */ +#include "namespace.h" #include <nsswitch.h> #include <stdlib.h> +#include "un-namespace.h" #include "../nss_files/files_serv.h" #include "nss_compat.h" @@ -49,11 +51,11 @@ switch ((enum nss_ent_type)mdata) { case nss_set_ent: f = va_arg(ap,int); - (void)nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, + (void)_nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "setservent", compat_src, f); break; case nss_end_ent: - (void)nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, + (void)_nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "endservent", compat_src); break; default: ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_compat/nss_compat.c#3 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_group.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <ctype.h> #include <errno.h> @@ -51,7 +52,7 @@ #include <unistd.h> #include "nss_tls.h" #include "gr_scan.h" - +#include "un-namespace.h" #ifdef HESIOD #define HESIOD_NAME_MAX 256 ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_addrinfo.c#5 (text+ko) ==== @@ -65,6 +65,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> @@ -91,7 +92,7 @@ #include <unistd.h> #include <stdio.h> #include <errno.h> - +#include "un-namespace.h" #include "res_config.h" #if defined(__KAME__) && defined(INET6) @@ -167,8 +168,6 @@ struct addrinfo *, const char *); static struct addrinfo *get_ai(const struct addrinfo *, const struct afd *, const char *); -static int get_portmatch(const struct addrinfo *, const char *); -static int get_port(struct addrinfo *, const char *, int); static const struct afd *find_afd(int); static struct addrinfo *getanswer(const querybuf *, int, const char *, int, @@ -182,8 +181,6 @@ static int res_querydomainN(const char *, const char *, struct res_target *, res_state); -static int str2number(const char *p); - static int get_canonname(const struct addrinfo *pai, struct addrinfo *ai, const char *str) @@ -264,94 +261,6 @@ return ai; } -static int -get_portmatch(const struct addrinfo *ai, const char *servname) -{ - - /* get_port does not touch first argument when matchonly == 1. */ - /* LINTED const cast */ - return get_port((struct addrinfo *)ai, servname, 1); -} - -static int -get_port(struct addrinfo *ai, const char *servname, int matchonly) -{ - const char *proto; - struct servent *sp; - int port; - int allownumeric; - - if (servname == NULL) - return 0; - switch (ai->ai_family) { - case AF_INET: -#ifdef AF_INET6 - case AF_INET6: -#endif - break; - default: - return 0; - } - - switch (ai->ai_socktype) { - case SOCK_RAW: - return EAI_SERVICE; - case SOCK_DGRAM: - case SOCK_STREAM: - allownumeric = 1; - break; - case ANY: - allownumeric = 0; - break; - default: - return EAI_SOCKTYPE; - } - - port = str2number(servname); - if (port >= 0) { - if (!allownumeric) - return EAI_SERVICE; - if (port < 0 || port > 65535) - return EAI_SERVICE; - port = htons(port); - } else { - if (ai->ai_flags & AI_NUMERICSERV) - return EAI_NONAME; - switch (ai->ai_socktype) { - case SOCK_DGRAM: - proto = "udp"; - break; - case SOCK_STREAM: - proto = "tcp"; - break; - default: - proto = NULL; - break; - } - - if ((sp = getservbyname(servname, proto)) == NULL) - return EAI_SERVICE; - port = sp->s_port; - } - - if (!matchonly) { - switch (ai->ai_family) { - case AF_INET: - ((struct sockaddr_in *)(void *) - ai->ai_addr)->sin_port = port; - break; -#ifdef INET6 - case AF_INET6: - ((struct sockaddr_in6 *)(void *) - ai->ai_addr)->sin6_port = port; - break; -#endif - } - } - - return 0; -} - static const struct afd * find_afd(int af) { @@ -995,23 +904,6 @@ } #endif /*RESOLVSORT*/ -static int -str2number(const char *p) -{ - char *ep; - unsigned long v; - - if (*p == '\0') - return -1; - ep = NULL; - errno = 0; - v = strtoul(p, &ep, 10); - if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX) - return v; - else - return -1; -} - /*ARGSUSED*/ int __dns_getaddrinfo(void *rv, void *cb_data, va_list ap) ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_namadr.c#6 (text+ko) ==== @@ -56,6 +56,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> @@ -68,12 +69,15 @@ #include <unistd.h> #include <string.h> #include <netdb.h> +#include <pthread.h> +#include <pthread_np.h> #include <resolv.h> #include <ctype.h> #include <errno.h> #include <syslog.h> #include <stdarg.h> #include <nsswitch.h> +#include "un-namespace.h" #include "reentrant.h" #include "netdb_private.h" #include "nss_dns.h" @@ -841,7 +845,7 @@ statp = __res_state(); if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) - return; + return (NS_UNAVAIL); if (f) statp->options |= RES_STAYOPEN | RES_USEVC; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_name6.c#4 (text+ko) ==== @@ -90,6 +90,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> @@ -115,6 +116,7 @@ #include <stdarg.h> #include <nsswitch.h> #include <unistd.h> +#include "un-namespace.h" #include "netdb_private.h" #include "res_config.h" #include "hosts_name6.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_net.c#3 (text+ko) ==== @@ -61,16 +61,18 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> #include <arpa/nameser.h> - #include <errno.h> #include <stdio.h> #include <stdlib.h> #include <netdb.h> +#include <pthread.h> +#include <pthread_np.h> #include <resolv.h> #include <ctype.h> #include <string.h> @@ -78,6 +80,7 @@ #include <syslog.h> #include <stdarg.h> #include <nsswitch.h> +#include "un-namespace.h" #include "netdb_private.h" #include "nss_dns.h" #include "reentrant.h" @@ -476,7 +479,7 @@ statp = __res_state(); if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) - return; + return (NS_UNAVAIL); if (f) statp->options |= RES_STAYOPEN | RES_USEVC; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_passwd.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <arpa/inet.h> #include <errno.h> @@ -52,6 +53,7 @@ #include <syslog.h> #include <unistd.h> #include <db.h> +#include "un-namespace.h" #include "libc_private.h" #include "nss_tls.h" #include "pw_scan.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/nss_dns.c#6 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_group.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <errno.h> #include <grp.h> @@ -46,6 +47,7 @@ #include <string.h> #include <syslog.h> #include <unistd.h> +#include "un-namespace.h" #include "nss_files.h" #include "nss_tls.h" #include "gr_scan.h" @@ -56,8 +58,6 @@ }; static void files_endstate(void *); NSS_TLS_HANDLING(files); -static int files_setgrent(void *, void *, va_list); -static int files_group(void *, void *, va_list); static void files_endstate(void *p) ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_addrinfo.c#2 (text+ko) ==== @@ -65,6 +65,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> @@ -90,6 +91,7 @@ #include <unistd.h> #include <stdio.h> #include <errno.h> +#include "un-namespace.h" #include "res_config.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_namadr.c#4 (text+ko) ==== @@ -54,33 +54,31 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> #include <errno.h> #include <netdb.h> +#include <pthread.h> +#include <pthread_np.h> #include <stdio.h> #include <ctype.h> #include <string.h> #include <stdarg.h> +#include <stdlib.h> #include <nsswitch.h> #include <arpa/nameser.h> /* XXX */ #include <resolv.h> /* XXX */ +#include "un-namespace.h" #include "reentrant.h" #include "netdb_private.h" #include "nss_files.h" -NETDB_THREAD_ALLOC(hostent) NETDB_THREAD_ALLOC(files_hostent_data) static void -hostent_free(void *ptr) -{ - free(ptr); -} - -static void files_hostent_data_free(void *ptr) { struct files_hostent_data *hed = ptr; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_name6.c#3 (text+ko) ==== @@ -90,6 +90,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> @@ -102,6 +103,7 @@ #include <nsswitch.h> #include <arpa/nameser.h> /* XXX */ #include <resolv.h> /* XXX */ +#include "un-namespace.h" #include "netdb_private.h" #include "hosts_name6.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_net.c#4 (text+ko) ==== @@ -44,17 +44,22 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> #include <arpa/nameser.h> #include <netdb.h> +#include <pthread.h> +#include <pthread_np.h> #include <resolv.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <stdarg.h> #include <nsswitch.h> +#include "un-namespace.h" #include "netdb_private.h" #include "reentrant.h" #include "copynetent.h" @@ -274,7 +279,6 @@ struct files_netent_data *ned; struct netent ne, *nptr; res_state statp; - int error; nptr = va_arg(ap, struct netent *); buffer = va_arg(ap, char *); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_passwd.c#4 (text+ko) ==== @@ -34,8 +34,9 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" +#include <arpa/inet.h> #include <sys/param.h> -#include <db.h> #include <errno.h> #include <fcntl.h> #include <netdb.h> @@ -48,6 +49,8 @@ #include <string.h> #include <syslog.h> #include <unistd.h> +#include "un-namespace.h" +#include <db.h> #include "nss_files.h" #include "nss_tls.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_proto.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <sys/types.h> #include <sys/socket.h> @@ -42,9 +43,11 @@ #include <netdb.h> #include <nsswitch.h> #include <pthread.h> +#include <pthread_np.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "un-namespace.h" #include "netdb_private.h" #include "nss_tls.h" #include "reentrant.h" @@ -70,12 +73,6 @@ free(ped); } -static void -protodata_free(void *ptr) -{ - free(ptr); -} - static int __copy_protoent(struct protoent *pe, struct protoent *pptr, char *buf, size_t buflen) ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_rpc.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ * Copyright (c) 1984 by Sun Microsystems, Inc. */ +#include "namespace.h" #include <sys/param.h> #include <sys/types.h> #include <sys/socket.h> @@ -44,12 +45,14 @@ #include <nsswitch.h> #include <netinet/in.h> #include <pthread.h> +#include <pthread_np.h> #include <stdio.h> #include <string.h> #include <stdarg.h> #include <stdlib.h> #include <rpc/rpc.h> #include <unistd.h> +#include "un-namespace.h" #include "nss_files.h" #include "nss_tls.h" #include "rpcunpack.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_serv.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <sys/types.h> #include <sys/socket.h> @@ -43,10 +44,12 @@ #include <netdb.h> #include <nsswitch.h> #include <pthread.h> +#include <pthread_np.h> #include <stdio.h> #include <string.h> #include <stdlib.h> #include <unistd.h> +#include "un-namespace.h" #include "files_serv.h" #include "nss_files.h" #include "nss_tls.h" @@ -192,19 +195,19 @@ if (st->compat_mode_active != 0) { switch (serv_mdata->how) { case nss_lt_name: - rv = nsdispatch(retval, compat_dtab, + rv = _nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservbyname_r", compat_src, name, proto, serv, buffer, bufsize, errnop); break; case nss_lt_id: - rv = nsdispatch(retval, compat_dtab, + rv = _nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservbyport_r", compat_src, port, proto, serv, buffer, bufsize, errnop); break; case nss_lt_all: - rv = nsdispatch(retval, compat_dtab, + rv = _nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservent_r", compat_src, serv, buffer, bufsize, errnop); break; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_shells.c#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.c#8 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_group.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <rpc/rpc.h> #include <rpcsvc/yp_prot.h> #include <rpcsvc/ypclnt.h> @@ -49,6 +50,7 @@ #include <string.h> #include <syslog.h> #include <unistd.h> +#include "un-namespace.h" #include "nss_tls.h" #include "gr_scan.h" @@ -88,8 +90,8 @@ } -static int -nis_group(void *retval, void *mdata, va_list ap) +int +__nis_group(void *retval, void *mdata, va_list ap) { char *map; struct nis_state *st; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_addrinfo.c#2 (text+ko) ==== @@ -62,6 +62,7 @@ * - FreeBSD allowed classful IPv4 numeric (127.1), the code does not. */ +#include "namespace.h" #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> @@ -88,11 +89,11 @@ #include <unistd.h> #include <stdio.h> #include <errno.h> - -#include "res_config.h" - #include <nsswitch.h> #include <stdarg.h> +#include "un-namespace.h" +#include "libc_private.h" +#include "res_config.h" #ifdef DEBUG #include <syslog.h> ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_namadr.c#4 (text+ko) ==== @@ -26,6 +26,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> @@ -39,6 +40,8 @@ #include <string.h> #include <stdarg.h> #include <nsswitch.h> +#include <pthread.h> +#include <pthread_np.h> #include <resolv.h> /* XXX */ //#ifdef YP #include <rpc/rpc.h> @@ -47,6 +50,7 @@ //#endif #include <stdarg.h> #include <nsswitch.h> +#include "un-namespace.h" #include "reentrant.h" #include "netdb_private.h" #include "nss_nis.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_name6.c#3 (text+ko) ==== @@ -90,6 +90,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> @@ -111,6 +112,7 @@ //#endif #include <stdarg.h> #include <nsswitch.h> +#include "un-namespace.h" #include "netdb_private.h" #include "hosts_name6.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_net.c#3 (text+ko) ==== @@ -26,6 +26,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <rpc/rpc.h> #include <rpcsvc/yp_prot.h> #include <rpcsvc/ypclnt.h> @@ -34,6 +35,8 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <netdb.h> +#include <pthread.h> +#include <pthread_np.h> #include <resolv.h> #include <stdio.h> #include <stdlib.h> @@ -43,6 +46,7 @@ #include <stdarg.h> #include <nsswitch.h> #include <arpa/nameser.h> +#include "un-namespace.h" #include "netdb_private.h" #include "reentrant.h" #include "copynetent.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_passwd.c#2 (text+ko) ==== @@ -34,11 +34,11 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "namespace.h" #include <rpc/rpc.h> #include <rpcsvc/yp_prot.h> #include <rpcsvc/ypclnt.h> #include <sys/param.h> -#include <db.h> #include <errno.h> #include <fcntl.h> #include <netdb.h> @@ -51,6 +51,7 @@ #include <string.h> #include <syslog.h> #include <unistd.h> +#include "un-namespace.h" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606201647.k5KGlBSH046087>