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

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

details:   https://anonhg.NetBSD.org/src/rev/7a6e89ff6503
branches:  netbsd-1-6
changeset: 528165:7a6e89ff6503
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:37:36 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/bin/nsupdate/nsupdate.c |   8 ++++----
 dist/bind/bin/probe_ipv6          |   3 ++-
 dist/bind/include/arpa/nameser.h  |  27 +++++++++++++++++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diffs (132 lines):

diff -r 5fccb1ef2c3b -r 7a6e89ff6503 dist/bind/bin/nsupdate/nsupdate.c
--- a/dist/bind/bin/nsupdate/nsupdate.c Fri Jun 28 11:37:27 2002 +0000
+++ b/dist/bind/bin/nsupdate/nsupdate.c Fri Jun 28 11:37:36 2002 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: nsupdate.c,v 1.3 2002/05/09 03:14:14 simonb Exp $      */
+/*     $NetBSD: nsupdate.c,v 1.3.2.1 2002/06/28 11:37:36 lukem Exp $   */
 
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "Id: nsupdate.c,v 8.26 2000/12/23 08:14:48 vixie Exp";
+static const char rcsid[] = "Id: nsupdate.c,v 8.27 2001/06/18 14:43:46 marka Exp";
 #endif /* not lint */
 
 /*
@@ -392,7 +392,7 @@
                    exit (1);
                }
                r_dname = dnbuf;
-               r_ttl = (r_opcode == ADD) ? -1 : 0;
+               r_ttl = (r_opcode == ADD) ? (~0U) : 0;
                r_type = -1;
                r_class = C_IN; /* default to IN */
                r_size = 0;
@@ -497,7 +497,7 @@
                        r_size = endp - cp + 1;
                        break;
                    case ADD:
-                       if (r_ttl == -1) {
+                       if (r_ttl == ~0U) {
                            fprintf (stderr,
                "ttl must be specified for record to be added: %s\n", buf);
                            exit (1);
diff -r 5fccb1ef2c3b -r 7a6e89ff6503 dist/bind/bin/probe_ipv6
--- a/dist/bind/bin/probe_ipv6  Fri Jun 28 11:37:27 2002 +0000
+++ b/dist/bind/bin/probe_ipv6  Fri Jun 28 11:37:36 2002 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-#      $NetBSD: probe_ipv6,v 1.3 1999/12/24 19:11:25 garbled Exp $
+#      $NetBSD: probe_ipv6,v 1.3.8.1 2002/06/28 11:37:45 lukem Exp $
+#
 
 set -e
 PATH=/bin:/usr/bin:$PATH; export PATH
diff -r 5fccb1ef2c3b -r 7a6e89ff6503 dist/bind/include/arpa/nameser.h
--- a/dist/bind/include/arpa/nameser.h  Fri Jun 28 11:37:27 2002 +0000
+++ b/dist/bind/include/arpa/nameser.h  Fri Jun 28 11:37:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nameser.h,v 1.3 2001/01/27 07:22:02 itojun Exp $       */
+/*     $NetBSD: nameser.h,v 1.3.2.1 2002/06/28 11:37:54 lukem Exp $    */
 
 /*
  * Copyright (c) 1983, 1989, 1993
@@ -51,7 +51,7 @@
  */
 
 /*
- *     Id: nameser.h,v 8.41 2000/12/23 08:14:50 vixie Exp
+ *     Id: nameser.h,v 8.47 2002/04/30 03:43:53 marka Exp
  */
 
 #ifndef _ARPA_NAMESER_H_
@@ -121,7 +121,7 @@
        const u_char    *_sections[ns_s_max];
        ns_sect         _sect;
        int             _rrnum;
-       const u_char    *_ptr;
+       const u_char    *_msg_ptr;
 } ns_msg;
 
 /* Private data structure - do not use from outside library. */
@@ -205,7 +205,9 @@
        ns_r_notauth = 9,       /* Not authoritative for zone */
        ns_r_notzone = 10,      /* Zone of record different from zone section */
        ns_r_max = 11,
-       /* The following are TSIG extended errors */
+       /* The following are EDNS extended rcodes */
+       ns_r_badvers = 16,
+       /* The following are TSIG errors */
        ns_r_badsig = 16,
        ns_r_badkey = 17,
        ns_r_badtime = 18
@@ -428,10 +430,15 @@
 #define NS_NXT_MAX 127
 
 /*
+ * EDNS0 extended flags, host order.
+ */
+#define NS_OPT_DNSSEC_OK       0x8000U
+
+/*
  * Inline versions of get/put short/long.  Pointer is advanced.
  */
 #define NS_GET16(s, cp) do { \
-       register u_char *t_cp = (u_char *)(cp); \
+       register const u_char *t_cp = (const u_char *)(cp); \
        (s) = ((u_int16_t)t_cp[0] << 8) \
            | ((u_int16_t)t_cp[1]) \
            ; \
@@ -439,7 +446,7 @@
 } while (0)
 
 #define NS_GET32(l, cp) do { \
-       register u_char *t_cp = (u_char *)(cp); \
+       register const u_char *t_cp = (const u_char *)(cp); \
        (l) = ((u_int32_t)t_cp[0] << 24) \
            | ((u_int32_t)t_cp[1] << 16) \
            | ((u_int32_t)t_cp[2] << 8) \
@@ -492,7 +499,9 @@
 #define        ns_name_skip            __ns_name_skip
 #define        ns_name_rollback        __ns_name_rollback
 #define        ns_sign                 __ns_sign
+#define        ns_sign2                __ns_sign2
 #define        ns_sign_tcp             __ns_sign_tcp
+#define        ns_sign_tcp2            __ns_sign_tcp2
 #define        ns_sign_tcp_init        __ns_sign_tcp_init
 #define ns_find_tsig           __ns_find_tsig
 #define        ns_verify               __ns_verify
@@ -537,8 +546,14 @@
                                      const u_char **));
 int            ns_sign __P((u_char *, int *, int, int, void *,
                             const u_char *, int, u_char *, int *, time_t));
+int            ns_sign2 __P((u_char *, int *, int, int, void *,
+                             const u_char *, int, u_char *, int *, time_t,
+                             u_char **, u_char **));
 int            ns_sign_tcp __P((u_char *, int *, int, int,
                                 ns_tcp_tsig_state *, int));
+int            ns_sign_tcp2 __P((u_char *, int *, int, int,
+                                 ns_tcp_tsig_state *, int,
+                                 u_char **, u_char **));
 int            ns_sign_tcp_init __P((void *, const u_char *, int,
                                        ns_tcp_tsig_state *));
 u_char         *ns_find_tsig __P((u_char *, u_char *));