[src/netbsd-1-6]: src/dist/bind/include Pull up revision 1.4 (requested by it...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/109a75b95a27
branches:  netbsd-1-6
changeset: 528173:109a75b95a27
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:39:34 2002 +0000

description:
Pull up revision 1.4 (requested by itojun in ticket #387):
Update to BIND 8.3.3.  Fixes buffer overrun in resolver code.

diffstat:

 dist/bind/include/netdb.h |  32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diffs (113 lines):

diff -r 5fbf0c2e5080 -r 109a75b95a27 dist/bind/include/netdb.h
--- a/dist/bind/include/netdb.h Fri Jun 28 11:39:23 2002 +0000
+++ b/dist/bind/include/netdb.h Fri Jun 28 11:39:34 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netdb.h,v 1.3 2000/03/01 10:49:59 itojun Exp $ */
+/*     $NetBSD: netdb.h,v 1.3.8.1 2002/06/28 11:39:34 lukem Exp $      */
 
 /*
  * ++Copyright++ 1980, 1983, 1988, 1993
@@ -88,17 +88,19 @@
 
 /*
  *      @(#)netdb.h    8.1 (Berkeley) 6/2/93
- *     Id: netdb.h,v 8.15 1999/09/18 06:23:46 vixie Exp
+ *     Id: netdb.h,v 8.17 2001/06/18 14:43:48 marka Exp
  */
 
 #ifndef _NETDB_H_
 #define _NETDB_H_
 
 #include <sys/param.h>
+#include <sys/types.h>
 #if (!defined(BSD)) || (BSD < 199306)
 # include <sys/bitypes.h>
 #endif
 #include <sys/cdefs.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <stdio.h>
 
@@ -118,10 +120,10 @@
 #define        _PATH_SERVICES  "/etc/services"
 #endif
 
-#ifdef _REENTRANT
 __BEGIN_DECLS
 extern int * __h_errno __P((void));
 __END_DECLS
+#ifdef _REENTRANT
 #define        h_errno (*__h_errno())
 #else
 extern int h_errno;
@@ -238,10 +240,17 @@
 #define        NI_NAMEREQD     0x00000004
 #define        NI_NUMERICSERV  0x00000008
 #define        NI_DGRAM        0x00000010
+#define        NI_WITHSCOPEID  0x00000020
+#define NI_NUMERICSCOPE        0x00000040
+
+/*
+ * Scope delimit character
+ */
+#define SCOPE_DELIMITER        '%'
 
 
 #ifdef _REENTRANT
-#if defined (__hpux) || defined(__osf__)
+#if defined (__hpux) || defined(__osf__) || defined(_AIX)
 #define        _MAXALIASES     35
 #define        _MAXLINELEN     1024
 #define        _MAXADDRS       35
@@ -336,10 +345,13 @@
 void           endnetent __P((void));
 void           endprotoent __P((void));
 void           endservent __P((void));
+void           freehostent __P((struct hostent *));
 struct hostent *gethostbyaddr __P((const char *, int, int));
 struct hostent *gethostbyname __P((const char *));
 struct hostent *gethostbyname2 __P((const char *, int));
 struct hostent *gethostent __P((void));
+struct hostent *getipnodebyaddr __P((const void *, size_t, int, int *));
+struct hostent *getipnodebyname __P((const char *, int, int, int *));
 struct netent  *getnetbyaddr __P((unsigned long, int));
 struct netent  *getnetbyname __P((const char *));
 struct netent  *getnetent __P((void));
@@ -361,20 +373,24 @@
 int            getnameinfo __P((const struct sockaddr *, size_t, char *,
                                 size_t, char *, size_t, int));
 void           freeaddrinfo __P((struct addrinfo *));
-char           *gai_strerror __P((int));
+const char     *gai_strerror __P((int));
 struct hostent  *getipnodebyname __P((const char *, int, int, int *));
 struct hostent *getipnodebyaddr __P((const void *, size_t, int, int *));
 void           freehostent __P((struct hostent *));
 
 
 #ifdef _REENTRANT
-#if defined(__hpux) || defined(__osf__)
+#if defined(__hpux) || defined(__osf__) || defined(_AIX)
 int            gethostbyaddr_r __P((const char *, int, int, struct hostent *,
                                        struct hostent_data *));
 int            gethostbyname_r __P((const char *, struct hostent *, 
                                        struct hostent_data *));
 int            gethostent_r __P((struct hostent *, struct hostent_data *));
+#if defined(_AIX)
+void           sethostent_r __P((int, struct hostent_data *));
+#else
 int            sethostent_r __P((int, struct hostent_data *));
+#endif 
 #if defined(__hpux)
 int            endhostent_r __P((struct hostent_data *));
 #else
@@ -421,8 +437,8 @@
 #else
 void           endservent_r __P((struct servent_data *));
 #endif
-#endif
-#if defined(sun) || defined(bsdi)
+#else
+ /* defined(sun) || defined(bsdi) */
 struct hostent *gethostbyaddr_r __P((const char *, int, int, struct hostent *,
                                        char *, int, int *));
 struct hostent *gethostbyname_r __P((const char *, struct hostent *,