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

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

details:   https://anonhg.NetBSD.org/src/rev/01f280c21107
branches:  netbsd-1-6
changeset: 528232:01f280c21107
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:56:23 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/tree.c        |  22 +++++++++++-----------
 dist/bind/lib/nameser/ns_date.c |   6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diffs (114 lines):

diff -r 840ccbc226b8 -r 01f280c21107 dist/bind/lib/isc/tree.c
--- a/dist/bind/lib/isc/tree.c  Fri Jun 28 11:56:05 2002 +0000
+++ b/dist/bind/lib/isc/tree.c  Fri Jun 28 11:56:23 2002 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: tree.c,v 1.1.1.1 1999/11/20 18:54:11 veego Exp $       */
+/*     $NetBSD: tree.c,v 1.1.1.1.10.1 2002/06/28 11:56:23 lukem Exp $  */
 
 #ifndef LINT
-static const char rcsid[] = "Id: tree.c,v 8.9 1999/01/08 19:25:47 vixie Exp";
+static const char rcsid[] = "Id: tree.c,v 8.10 2001/11/01 05:33:46 marka Exp";
 #endif
 
 /*
@@ -103,7 +103,7 @@
 }
        
 tree_t
-tree_srch(tree **ppr_tree, int (*pfi_compare)(), tree_t        p_user) {
+tree_srch(tree **ppr_tree, int (*pfi_compare)(tree_t, tree_t), tree_t  p_user) {
        ENTER("tree_srch")
 
        if (*ppr_tree) {
@@ -130,7 +130,7 @@
 }
 
 tree_t
-tree_add(tree **ppr_tree, int (*pfi_compare)(),
+tree_add(tree **ppr_tree, int (*pfi_compare)(tree_t, tree_t),
         tree_t p_user, void (*pfv_uar)())
 {
        int i_balance = FALSE;
@@ -142,7 +142,7 @@
 }
 
 int
-tree_delete(tree **ppr_p, int (*pfi_compare)(),
+tree_delete(tree **ppr_p, int (*pfi_compare)(tree_t, tree_t),
            tree_t p_user, void (*pfv_uar)())
 {
        int i_balance = FALSE, i_uar_called = FALSE;
@@ -153,7 +153,7 @@
 }
 
 int
-tree_trav(tree **ppr_tree, int (*pfi_uar)()) {
+tree_trav(tree **ppr_tree, int (*pfi_uar)(tree_t)) {
        ENTER("tree_trav")
 
        if (!*ppr_tree)
@@ -169,7 +169,7 @@
 }
 
 void
-tree_mung(tree **ppr_tree, void        (*pfv_uar)()) {
+tree_mung(tree **ppr_tree, void        (*pfv_uar)(tree_t)) {
        ENTER("tree_mung")
        if (*ppr_tree) {
                tree_mung(&(**ppr_tree).left, pfv_uar);
@@ -184,7 +184,7 @@
 
 static tree *
 sprout(tree **ppr, tree_t p_data, int *pi_balance,
-       int (*pfi_compare)(), void (*pfv_delete)())
+       int (*pfi_compare)(tree_t, tree_t), void (*pfv_delete)(tree_t))
 {
        tree *p1, *p2, *sub;
        int cmp;
@@ -337,8 +337,8 @@
 }
 
 static int
-delete(tree **ppr_p, int (*pfi_compare)(), tree_t p_user,
-       void (*pfv_uar)(), int *pi_balance, int *pi_uar_called)
+delete(tree **ppr_p, int (*pfi_compare)(tree_t, tree_t), tree_t p_user,
+       void (*pfv_uar)(tree_t), int *pi_balance, int *pi_uar_called)
 {
        tree *pr_q;
        int i_comp, i_ret;
@@ -392,7 +392,7 @@
 
 static void
 del(tree **ppr_r, int *pi_balance, tree **ppr_q,
-    void (*pfv_uar)(), int *pi_uar_called)
+    void (*pfv_uar)(tree_t), int *pi_uar_called)
 {
        ENTER("del")
 
diff -r 840ccbc226b8 -r 01f280c21107 dist/bind/lib/nameser/ns_date.c
--- a/dist/bind/lib/nameser/ns_date.c   Fri Jun 28 11:56:05 2002 +0000
+++ b/dist/bind/lib/nameser/ns_date.c   Fri Jun 28 11:56:23 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ns_date.c,v 1.1.1.1 1999/11/20 18:54:11 veego Exp $    */
+/*     $NetBSD: ns_date.c,v 1.1.1.1.10.1 2002/06/28 11:56:33 lukem Exp $       */
 
 /*
  * Copyright (c) 1999 by Internet Software Consortium.
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "Id: ns_date.c,v 1.2 1999/10/13 16:39:35 vixie Exp";
+static const char rcsid[] = "Id: ns_date.c,v 1.3 2001/05/29 05:49:34 marka Exp";
 #endif
 
 /* Import. */
@@ -118,7 +118,7 @@
        int i;
 
        for (i = 0; i < size; i++) {
-               if (!isdigit(buf[i]))
+               if (!isdigit((unsigned char)(buf[i])))
                        *errp = 1;
                result = (result * 10) + buf[i] - '0';
        }