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

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

details:   https://anonhg.NetBSD.org/src/rev/3edf3f8cc587
branches:  netbsd-1-6
changeset: 528229:3edf3f8cc587
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:55: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/lib/isc/eventlib.c   |  12 ++++++------
 dist/bind/lib/isc/eventlib_p.h |  12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (97 lines):

diff -r 9266620c56aa -r 3edf3f8cc587 dist/bind/lib/isc/eventlib.c
--- a/dist/bind/lib/isc/eventlib.c      Fri Jun 28 11:55:26 2002 +0000
+++ b/dist/bind/lib/isc/eventlib.c      Fri Jun 28 11:55:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eventlib.c,v 1.3 2001/01/27 07:22:04 itojun Exp $      */
+/*     $NetBSD: eventlib.c,v 1.3.2.1 2002/06/28 11:55:36 lukem Exp $   */
 
 /*
  * Copyright (c) 1995-1999 by Internet Software Consortium
@@ -22,7 +22,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "Id: eventlib.c,v 1.45 2000/02/04 07:25:39 vixie Exp";
+static const char rcsid[] = "Id: eventlib.c,v 1.46 2001/11/01 05:35:48 marka Exp";
 #endif
 
 #include "port_before.h"
@@ -195,7 +195,7 @@
        /* Ensure that exactly one of EV_POLL or EV_WAIT was specified. */
        x = ((options & EV_POLL) != 0) + ((options & EV_WAIT) != 0);
        if (x != 1)
-               ERR(EINVAL);
+               EV_ERR(EINVAL);
 
        /* Get the time of day.  We'll do this again after select() blocks. */
        ctx->lastEventTime = evNowTime();
@@ -250,7 +250,7 @@
 
                /* Are there any events at all? */
                if ((options & EV_WAIT) != 0 && !nextTimer && ctx->fdMax == -1)
-                       ERR(ENOENT);
+                       EV_ERR(ENOENT);
 
                /* Figure out what select()'s timeout parameter should be. */
                if ((options & EV_POLL) != 0) {
@@ -345,11 +345,11 @@
                                }
                                abort();
                        }
-                       ERR(pselect_errno);
+                       EV_ERR(pselect_errno);
                }
                if (x == 0 && (nextTimer == NULL || !timerPast) &&
                    (options & EV_POLL))
-                       ERR(EWOULDBLOCK);
+                       EV_ERR(EWOULDBLOCK);
                ctx->fdCount = x;
 #ifdef EVENTLIB_TIME_CHECKS
                ctx->lastFdCount = x;
diff -r 9266620c56aa -r 3edf3f8cc587 dist/bind/lib/isc/eventlib_p.h
--- a/dist/bind/lib/isc/eventlib_p.h    Fri Jun 28 11:55:26 2002 +0000
+++ b/dist/bind/lib/isc/eventlib_p.h    Fri Jun 28 11:55:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eventlib_p.h,v 1.3 2001/01/27 07:22:04 itojun Exp $    */
+/*     $NetBSD: eventlib_p.h,v 1.3.2.1 2002/06/28 11:55:46 lukem Exp $ */
 
 /*
  * Copyright (c) 1995-1999 by Internet Software Consortium
@@ -20,7 +20,7 @@
 /* eventlib_p.h - private interfaces for eventlib
  * vix 09sep95 [initial]
  *
- * Id: eventlib_p.h,v 1.28 2000/02/04 08:28:34 vixie Exp
+ * Id: eventlib_p.h,v 1.30 2001/11/01 05:35:50 marka Exp
  */
 
 #ifndef _EVENTLIB_P_H
@@ -45,8 +45,8 @@
 #include <isc/memcluster.h>
 
 #define        EV_MASK_ALL     (EV_READ | EV_WRITE | EV_EXCEPT)
-#define ERR(e)         return (errno = (e), -1)
-#define OK(x)          if ((x) < 0) ERR(errno); else (void)NULL
+#define EV_ERR(e)              return (errno = (e), -1)
+#define OK(x)          if ((x) < 0) EV_ERR(errno); else (void)NULL
 
 #define        NEW(p)          if (((p) = memget(sizeof *(p))) != NULL) \
                                FILL(p); \
@@ -87,7 +87,7 @@
                struct sockaddr_un      un;
 #endif
        }               la;
-       int             lalen;
+       ISC_SOCKLEN_T   lalen;
        union {
                struct sockaddr         sa;
                struct sockaddr_in      in;
@@ -95,7 +95,7 @@
                struct sockaddr_un      un;
 #endif
        }               ra;
-       int             ralen;
+       ISC_SOCKLEN_T   ralen;
        int             ioErrno;
        evConn *        conn;
        LINK(struct evAccept) link;