[src/netbsd-1-6]: src/dist/bind/lib/isc Pull up revision 1.2 (requested by it...

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

details:   https://anonhg.NetBSD.org/src/rev/770061725940
branches:  netbsd-1-6
changeset: 528221:770061725940
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:54:05 2002 +0000

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

diffstat:

 dist/bind/lib/isc/assertions.c |  15 ++++++++-------
 dist/bind/lib/isc/bitncmp.c    |   8 ++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diffs (80 lines):

diff -r cd8a6128e18e -r 770061725940 dist/bind/lib/isc/assertions.c
--- a/dist/bind/lib/isc/assertions.c    Fri Jun 28 11:53:56 2002 +0000
+++ b/dist/bind/lib/isc/assertions.c    Fri Jun 28 11:54:05 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: assertions.c,v 1.1.1.1 1999/11/20 18:54:10 veego Exp $ */
+/*     $NetBSD: assertions.c,v 1.1.1.1.10.1 2002/06/28 11:54:05 lukem Exp $    */
 
 /*
  * Copyright (c) 1997,1999 by Internet Software Consortium.
@@ -18,7 +18,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "Id: assertions.c,v 8.3 1999/01/08 19:25:14 vixie Exp";
+static const char rcsid[] = "Id: assertions.c,v 8.4 2001/05/29 05:49:22 marka Exp";
 #endif
 
 #include "port_before.h"
@@ -36,7 +36,8 @@
  * Forward.
  */
 
-static void default_assertion_failed(char *, int, assertion_type, char *, int);
+static void default_assertion_failed(const char *, int, assertion_type,
+                                    const char *, int);
 
 /*
  * Public.
@@ -52,9 +53,9 @@
                __assertion_failed = f;
 }
 
-char *
+const char *
 assertion_type_to_text(assertion_type type) {
-       char *result;
+       const char *result;
 
        switch (type) {
        case assert_require:
@@ -80,8 +81,8 @@
  */
 
 static void
-default_assertion_failed(char *file, int line, assertion_type type, char *cond,
-                        int print_errno)
+default_assertion_failed(const char *file, int line, assertion_type type,
+                        const char *cond, int print_errno)
 {
        fprintf(stderr, "%s:%d: %s(%s)%s%s failed.\n",
                file, line, assertion_type_to_text(type), cond,
diff -r cd8a6128e18e -r 770061725940 dist/bind/lib/isc/bitncmp.c
--- a/dist/bind/lib/isc/bitncmp.c       Fri Jun 28 11:53:56 2002 +0000
+++ b/dist/bind/lib/isc/bitncmp.c       Fri Jun 28 11:54:05 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bitncmp.c,v 1.1.1.1 1999/11/20 18:54:10 veego Exp $    */
+/*     $NetBSD: bitncmp.c,v 1.1.1.1.10.1 2002/06/28 11:54:13 lukem Exp $       */
 
 /*
  * Copyright (c) 1996,1999 by Internet Software Consortium.
@@ -18,7 +18,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "Id: bitncmp.c,v 1.6 1999/01/08 19:25:20 vixie Exp";
+static const char rcsid[] = "Id: bitncmp.c,v 1.7 2001/05/29 05:49:23 marka Exp";
 #endif
 
 #include "port_before.h"
@@ -53,8 +53,8 @@
        if (x)
                return (x);
 
-       lb = ((u_char *)l)[b];
-       rb = ((u_char *)r)[b];
+       lb = ((const u_char *)l)[b];
+       rb = ((const u_char *)r)[b];
        for (b = n % 8; b > 0; b--) {
                if ((lb & 0x80) != (rb & 0x80)) {
                        if (lb & 0x80)