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

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

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

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

diffstat:

 dist/bind/lib/irs/irs_data.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 7bb5822d78d7 -r 09209e7b1d91 dist/bind/lib/irs/irs_data.c
--- a/dist/bind/lib/irs/irs_data.c      Fri Jun 28 11:51:07 2002 +0000
+++ b/dist/bind/lib/irs/irs_data.c      Fri Jun 28 11:51:15 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: irs_data.c,v 1.4 2001/01/27 07:22:04 itojun Exp $      */
+/*     $NetBSD: irs_data.c,v 1.4.2.1 2002/06/28 11:51:15 lukem Exp $   */
 
 /*
  * Copyright (c) 1996,1999 by Internet Software Consortium.
@@ -18,7 +18,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "Id: irs_data.c,v 1.15 2000/12/23 08:14:54 vixie Exp";
+static const char rcsid[] = "Id: irs_data.c,v 1.19 2001/08/20 07:08:41 marka Exp";
 #endif
 
 #include "port_before.h"
@@ -69,7 +69,7 @@
 net_data_destroy(void *p) {
        struct net_data *net_data = p;
 
-       res_nclose(net_data->res);
+       res_ndestroy(net_data->res);
        if (net_data->gr != NULL) {
                (*net_data->gr->close)(net_data->gr);
                net_data->gr = NULL;
@@ -154,7 +154,8 @@
        if (net_data->res == NULL)
                return (NULL);
 
-       if (res_ninit(net_data->res) == -1)
+       if ((net_data->res->options & RES_INIT) == 0 &&
+           res_ninit(net_data->res) == -1)
                return (NULL);
 
        return (net_data);
@@ -167,6 +168,7 @@
        res_nclose(net_data->res);
 }
 
+#ifdef _REENTRANT
 struct __res_state *
 __res_state(void) {
        /* NULL param here means use the default config file. */
@@ -176,6 +178,7 @@
 
        return (&_res);
 }
+#endif
 
 int *
 __h_errno(void) {