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

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

details:   https://anonhg.NetBSD.org/src/rev/1fe115d62d91
branches:  netbsd-1-6
changeset: 528167:1fe115d62d91
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:38:15 2002 +0000

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

diffstat:

 dist/bind/include/irs.h            |  21 +++++++++++++++------
 dist/bind/include/isc/assertions.h |  10 +++++-----
 dist/bind/include/isc/ctl.h        |  14 +++++++++-----
 3 files changed, 29 insertions(+), 16 deletions(-)

diffs (154 lines):

diff -r df32bbecc341 -r 1fe115d62d91 dist/bind/include/irs.h
--- a/dist/bind/include/irs.h   Fri Jun 28 11:38:06 2002 +0000
+++ b/dist/bind/include/irs.h   Fri Jun 28 11:38:15 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: irs.h,v 1.2 2001/01/27 07:22:02 itojun Exp $   */
+/*     $NetBSD: irs.h,v 1.2.2.1 2002/06/28 11:38:15 lukem Exp $        */
 
 /*
  * Copyright (c) 1996,1999 by Internet Software Consortium.
@@ -18,7 +18,7 @@
  */
 
 /*
- * Id: irs.h,v 8.5 2000/12/23 08:14:49 vixie Exp
+ * Id: irs.h,v 8.6 2001/05/29 05:47:00 marka Exp
  */
 
 #ifndef _IRS_H_INCLUDED
@@ -32,6 +32,7 @@
 #include <netdb.h>
 #include <resolv.h>
 #include <pwd.h>
+#include <netgroup.h>
 
 /*
  * This is the group map class.
@@ -116,6 +117,8 @@
        struct __res_state * (*res_get) __P((struct irs_ho *));
        void            (*res_set) __P((struct irs_ho *, res_state,
                                        void (*)(void *)));
+       struct addrinfo *(*addrinfo) __P((struct irs_ho *, const char *,
+                                         const struct addrinfo *));
 };
 
 /*
@@ -140,8 +143,8 @@
 struct irs_ng {
        void *          private;
        void            (*close) __P((struct irs_ng *));
-       int             (*next) __P((struct irs_ng *, char **, char **,
-                                    char **));
+       int             (*next) __P((struct irs_ng *, const char **,
+                                    const char **, const char **));
        int             (*test) __P((struct irs_ng *, const char *,
                                     const char *, const char *,
                                     const char *));
@@ -263,6 +266,12 @@
 extern void            sethostent_p __P((int stayopen,
                                          struct net_data *net_data));
 extern void            endhostent_p __P((struct net_data *net_data));
+extern struct hostent  *getipnodebyname_p __P((const char *name, int af,
+                                              int flags, int *errp,
+                                              struct net_data *net_data));
+extern struct hostent  *getipnodebyaddr_p __P((const void *addr, size_t len,
+                                             int af, int *errp,
+                                             struct net_data *net_data));
 
 extern struct netent   *getnetent_p __P((struct net_data *net_data));
 extern struct netent   *getnetbyname_p __P((const char *name,
@@ -281,8 +290,8 @@
                                       const char *user,
                                       const char *domain,
                                       struct net_data *net_data));
-extern int             getnetgrent_p __P((char **host, char **user,
-                                          char **domain,
+extern int             getnetgrent_p __P((const char **host, const char **user,
+                                          const char **domain,
                                           struct net_data *net_data));
 
 extern struct protoent  *getprotoent_p __P((struct net_data *net_data));
diff -r df32bbecc341 -r 1fe115d62d91 dist/bind/include/isc/assertions.h
--- a/dist/bind/include/isc/assertions.h        Fri Jun 28 11:38:06 2002 +0000
+++ b/dist/bind/include/isc/assertions.h        Fri Jun 28 11:38:15 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: assertions.h,v 1.2 2001/01/27 07:22:02 itojun Exp $    */
+/*     $NetBSD: assertions.h,v 1.2.2.1 2002/06/28 11:38:23 lukem Exp $ */
 
 /*
  * Copyright (c) 1997-1999 by Internet Software Consortium.
@@ -18,7 +18,7 @@
  */
 
 /*
- * Id: assertions.h,v 8.3 2000/07/17 07:53:59 vixie Exp
+ * Id: assertions.h,v 8.4 2001/05/29 05:47:07 marka Exp
  */
 
 #ifndef ASSERTIONS_H
@@ -28,12 +28,12 @@
        assert_require, assert_ensure, assert_insist, assert_invariant
 } assertion_type;
 
-typedef void (*assertion_failure_callback)(char *, int, assertion_type, char *,
-                                          int);
+typedef void (*assertion_failure_callback)(const char *, int, assertion_type,
+                                          const char *, int);
 
 extern assertion_failure_callback __assertion_failed;
 void set_assertion_failure_callback(assertion_failure_callback f);
-char *assertion_type_to_text(assertion_type type);
+const char *assertion_type_to_text(assertion_type type);
 
 #ifdef CHECK_ALL
 #define CHECK_REQUIRE          1
diff -r df32bbecc341 -r 1fe115d62d91 dist/bind/include/isc/ctl.h
--- a/dist/bind/include/isc/ctl.h       Fri Jun 28 11:38:06 2002 +0000
+++ b/dist/bind/include/isc/ctl.h       Fri Jun 28 11:38:15 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ctl.h,v 1.2 2000/10/08 20:03:12 is Exp $       */
+/*     $NetBSD: ctl.h,v 1.2.2.1 2002/06/28 11:38:32 lukem Exp $        */
 
 #ifndef ISC_CTL_H
 #define ISC_CTL_H
@@ -21,7 +21,7 @@
  */
 
 /*
- * Id: ctl.h,v 8.9 1999/08/08 20:16:45 vixie Exp
+ * Id: ctl.h,v 8.11 2001/08/10 02:40:49 marka Exp
  */
 
 #include <sys/types.h>
@@ -48,7 +48,7 @@
 
 typedef void (*ctl_verbfunc)(struct ctl_sctx *, struct ctl_sess *,
                             const struct ctl_verb *, const char *rest,
-                            u_int respflags, void *respctx, void *uctx);
+                            u_int respflags, const void *respctx, void *uctx);
 
 typedef void (*ctl_srvrdone)(struct ctl_sctx *, struct ctl_sess *, void *);
 
@@ -64,8 +64,12 @@
 
 #define        ctl_logger      __ctl_logger
 
+#ifdef __GNUC__
 void                   ctl_logger(enum ctl_severity, const char *, ...)
-     __attribute__((__format__(__printf__, 2, 3)));
+                               __attribute__((__format__(__printf__, 2, 3)));
+#else
+void                   ctl_logger(enum ctl_severity, const char *, ...);
+#endif
 
 /* Client symbols. */
 
@@ -97,7 +101,7 @@
                                   ctl_logfunc, void *);
 void                   ctl_endserver(struct ctl_sctx *);
 void                   ctl_response(struct ctl_sess *, u_int,
-                                    const char *, u_int, void *,
+                                    const char *, u_int, const void *,
                                     ctl_srvrdone, void *,
                                     const char *, size_t);
 void                   ctl_sendhelp(struct ctl_sess *, u_int);