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

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

details:   https://anonhg.NetBSD.org/src/rev/83d4db57ccc4
branches:  netbsd-1-6
changeset: 528152:83d4db57ccc4
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:35:11 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/named/ns_sort.c  |  11 +++++++----
 dist/bind/bin/named/ns_stats.c |   9 +++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diffs (76 lines):

diff -r eda26245e2a8 -r 83d4db57ccc4 dist/bind/bin/named/ns_sort.c
--- a/dist/bind/bin/named/ns_sort.c     Fri Jun 28 11:35:00 2002 +0000
+++ b/dist/bind/bin/named/ns_sort.c     Fri Jun 28 11:35:11 2002 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: ns_sort.c,v 1.3 2001/01/27 07:22:00 itojun Exp $       */
+/*     $NetBSD: ns_sort.c,v 1.3.2.1 2002/06/28 11:35:11 lukem Exp $    */
 
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_sort.c    4.10 (Berkeley) 3/3/91";
-static const char rcsid[] = "Id: ns_sort.c,v 8.6 2000/04/21 06:54:13 vixie Exp";
+static const char rcsid[] = "Id: ns_sort.c,v 8.8 2001/09/25 04:50:22 marka Exp";
 #endif /* not lint */
 
 /*
@@ -243,6 +243,7 @@
                        indirect = 1;
                        break;
                default:
+                       indirect = 0;
                        panic("unexpected ime type in ip_match_address()",
                              NULL);
                }
@@ -285,6 +286,7 @@
                                iml = imematch->next->u.indirect.list;
                                break;
                        default:
+                               iml = NULL;
                                panic("unexpected ime type in ip_match_address()",
                                      NULL);
                        }
@@ -306,9 +308,9 @@
 
 static int
 sort_rr(u_char *cp, u_char *eom, int ancount, ip_match_list iml) {
-       int type, class, dlen, n, c, distance, closest;
+       int type, class, dlen, n, c, distance, closest = 0;
        struct in_addr inaddr;
-       u_char *rr1 = NULL, *rrbest, *cpstart;
+       u_char *rr1 = NULL, *rrbest = NULL, *cpstart;
 
        rr1 = NULL;
        cpstart = cp;
@@ -387,6 +389,7 @@
                        indirect = 1;
                        break;
                default:
+                       indirect = 0;
                        panic("unexpected ime type in ip_match_address()",
                              NULL);
                }
diff -r eda26245e2a8 -r 83d4db57ccc4 dist/bind/bin/named/ns_stats.c
--- a/dist/bind/bin/named/ns_stats.c    Fri Jun 28 11:35:00 2002 +0000
+++ b/dist/bind/bin/named/ns_stats.c    Fri Jun 28 11:35:11 2002 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: ns_stats.c,v 1.3 2001/01/27 07:22:00 itojun Exp $      */
+/*     $NetBSD: ns_stats.c,v 1.3.2.1 2002/06/28 11:35:22 lukem Exp $   */
 
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)ns_stats.c   4.10 (Berkeley) 6/27/90";
-static const char rcsid[] = "Id: ns_stats.c,v 8.32 2000/11/29 06:56:05 marka Exp";
+static const char rcsid[] = "Id: ns_stats.c,v 8.34 2001/08/09 13:17:21 marka Exp";
 #endif /* not lint */
 
 /*
@@ -383,6 +383,11 @@
 #ifdef HAVE_GETRUSAGE
 # define tv_float(tv) ((tv).tv_sec + ((tv).tv_usec / 1000000.0))
 
+       UNUSED(ctx);
+       UNUSED(uap);
+       UNUSED(due);
+       UNUSED(inter);
+
        getrusage(RUSAGE_SELF, &usage);
        getrusage(RUSAGE_CHILDREN, &childu);