Add nsswitch support. By creating an /etc/nsswitch.conf file, you can

configure FreeBSD so that various databases such as passwd and group can be
looked up using flat files, NIS, or Hesiod.

= Hesiod has been added to libc (see hesiod(3)).

= A library routine for parsing nsswitch.conf and invoking callback
  functions as specified has been added to libc (see nsdispatch(3)).

= The following C library functions have been modified to use nsdispatch:
    . getgrent, getgrnam, getgrgid
    . getpwent, getpwnam, getpwuid
    . getusershell
    . getaddrinfo
    . gethostbyname, gethostbyname2, gethostbyaddr
    . getnetbyname, getnetbyaddr
    . getipnodebyname, getipnodebyaddr, getnodebyname, getnodebyaddr

= host.conf has been removed from src/etc.  rc.network has been modified
  to warn that host.conf is no longer used at boot time.  In addition, if
  there is a host.conf but no nsswitch.conf, the latter is created at boot
  time from the former.

Obtained from:	NetBSD

1 files changed, 51 insertions, 11 deletions

diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index 82e0b3d..518d512 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -39,6 +39,8 @@ static char rcsid[] = "$FreeBSD$";
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
+#include <stdarg.h>
+#include <nsswitch.h>
 #ifdef YP
 #include <rpc/rpc.h>
 #include <rpcsvc/yp_prot.h>
@@ -52,7 +54,6 @@ static char rcsid[] = "$FreeBSD$";
 static char *host_aliases[MAXALIASES];
 static char hostaddr[MAXADDRS];
 static char *host_addrs[2];
-#endif /* YP */
 
 static struct hostent *
 _gethostbynis(name, map, af)
@@ -60,7 +61,6 @@ _gethostbynis(name, map, af)
 	char *map;
 	int af;
 {
-#ifdef YP
 	register char *cp, **q;
 	char *result;
 	int resultlen,size;
@@ -122,24 +122,64 @@ _gethostbynis(name, map, af)
 	}
 	*q = NULL;
 	return (&h);
-#else
-	return (NULL);
-#endif /* YP */
 }
+#endif /* YP */
 
+/* XXX _gethostbynisname/_gethostbynisaddr only used by getaddrinfo */
 struct hostent *
-_gethostbynisname(name, af)
-	const char *name;
-	int af;
+_gethostbynisname(const char *name, int af)
 {
+#ifdef YP
 	return _gethostbynis(name, "hosts.byname", af);
+#else
+	return NULL;
+#endif
 }
 
 struct hostent *
-_gethostbynisaddr(addr, len, af)
+_gethostbynisaddr(const char *addr, int len, int af)
+{
+#ifdef YP
+	return _gethostbynis(inet_ntoa(*(struct in_addr *)addr), 
+			     "hosts.byaddr", af);
+#else
+	return NULL;
+#endif
+}
+
+
+int
+_nis_gethostbyname(void *rval, void *cb_data, va_list ap)
+{
+#ifdef YP
+	const char *name;
+	int af;
+
+	name = va_arg(ap, const char *);
+	af = va_arg(ap, int);
+
+	*(struct hostent **)rval = _gethostbynis(name, "hosts.byname", af);
+	return (*(struct hostent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
+#else
+	return NS_UNAVAIL;
+#endif
+}
+
+int
+_nis_gethostbyaddr(void *rval, void *cb_data, va_list ap)
+{
+#ifdef YP
 	const char *addr;
 	int len;
 	int af;
-{
-	return _gethostbynis(inet_ntoa(*(struct in_addr *)addr),"hosts.byaddr", af);
+
+	addr = va_arg(ap, const char *);
+	len = va_arg(ap, int);
+	af = va_arg(ap, int);
+	
+	*(struct hostent **)rval =_gethostbynis(inet_ntoa(*(struct in_addr *)addr),"hosts.byaddr", af);
+	return (*(struct hostent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
+#else
+	return NS_UNAVAIL;
+#endif
 }