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, 21 insertions, 8 deletions

diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
index cd5f0f4..eeecd22 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -65,6 +65,8 @@ static char rcsid[] = "$FreeBSD$";
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
+#include <stdarg.h>
+#include <nsswitch.h>
 #include <arpa/nameser.h>	/* XXX */
 #include <resolv.h>		/* XXX */
 
@@ -163,13 +165,16 @@ gethostent()
 	return (&host);
 }
 
-struct hostent *
-_gethostbyhtname(name, af)
+int
+_ht_gethostbyname(void *rval, void *cb_data, va_list ap) 
+{
 	const char *name;
 	int af;
-{
 	register struct hostent *p;
 	register char **cp;
+
+	name = va_arg(ap, const char *);
+	af = va_arg(ap, int);
 	
 	sethostent(0);
 	while ((p = gethostent()) != NULL) {
@@ -183,20 +188,28 @@ _gethostbyhtname(name, af)
 	}
 found:
 	endhostent();
-	return (p);
+	*(struct hostent **)rval = p;
+	
+	return (p != NULL) ? NS_SUCCESS : NS_NOTFOUND;
 }
 
-struct hostent *
-_gethostbyhtaddr(addr, len, af)
+int 
+_ht_gethostbyaddr(void *rval, void *cb_data, va_list ap)
+{
 	const char *addr;
 	int len, af;
-{
 	register struct hostent *p;
 
+	addr = va_arg(ap, const char *);
+	len = va_arg(ap, int);
+	af = va_arg(ap, int);
+
 	sethostent(0);
 	while ((p = gethostent()) != NULL)
 		if (p->h_addrtype == af && !bcmp(p->h_addr, addr, len))
 			break;
 	endhostent();
-	return (p);
+
+	*(struct hostent **)rval = p;
+	return (p != NULL) ? NS_SUCCESS : NS_NOTFOUND;
 }