[src/netbsd-1-6]: src/dist/bind/lib/bsd Pull up revision 1.1.1.2 (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/5583139f625e
branches:  netbsd-1-6
changeset: 528178:5583139f625e
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:40:28 2002 +0000

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

diffstat:

 dist/bind/lib/bsd/daemon.c       |   4 +++-
 dist/bind/lib/bsd/ftruncate.c    |   4 +++-
 dist/bind/lib/bsd/gettimeofday.c |   4 +++-
 dist/bind/lib/bsd/mktemp.c       |   4 +++-
 dist/bind/lib/bsd/putenv.c       |   4 +++-
 dist/bind/lib/bsd/readv.c        |   4 +++-
 dist/bind/lib/bsd/setenv.c       |   4 +++-
 dist/bind/lib/bsd/setitimer.c    |   4 +++-
 dist/bind/lib/bsd/strcasecmp.c   |   4 +++-
 dist/bind/lib/bsd/strdup.c       |   2 ++
 dist/bind/lib/bsd/strerror.c     |  22 +++++++++++++++++-----
 dist/bind/lib/bsd/strpbrk.c      |   4 +++-
 dist/bind/lib/bsd/strsep.c       |   4 +++-
 dist/bind/lib/bsd/strtoul.c      |   4 +++-
 dist/bind/lib/bsd/utimes.c       |   2 ++
 dist/bind/lib/bsd/writev.c       |   4 +++-
 16 files changed, 60 insertions(+), 18 deletions(-)

diffs (233 lines):

diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/daemon.c
--- a/dist/bind/lib/bsd/daemon.c        Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/daemon.c        Fri Jun 28 11:40:28 2002 +0000
@@ -1,6 +1,8 @@
+/*     $NetBSD: daemon.c,v 1.1.1.1.2.1 2002/06/28 11:40:28 lukem Exp $ */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)daemon.c     8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: daemon.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: daemon.c,v 8.2 1999/10/13 16:39:20 vixie Exp";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/ftruncate.c
--- a/dist/bind/lib/bsd/ftruncate.c     Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/ftruncate.c     Fri Jun 28 11:40:28 2002 +0000
@@ -1,5 +1,7 @@
+/*     $NetBSD: ftruncate.c,v 1.1.1.1.2.1 2002/06/28 11:40:37 lukem Exp $      */
+
 #ifndef LINT
-static const char rcsid[] = "$Id: ftruncate.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: ftruncate.c,v 8.4 1999/10/13 16:39:21 vixie Exp";
 #endif
 
 /*
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/gettimeofday.c
--- a/dist/bind/lib/bsd/gettimeofday.c  Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/gettimeofday.c  Fri Jun 28 11:40:28 2002 +0000
@@ -1,5 +1,7 @@
+/*     $NetBSD: gettimeofday.c,v 1.1.1.1.2.1 2002/06/28 11:40:46 lukem Exp $   */
+
 #ifndef LINT
-static const char rcsid[] = "$Id: gettimeofday.c,v 1.1.1.1 2001/05/17 22:41:07 itojun Exp $";
+static const char rcsid[] = "Id: gettimeofday.c,v 8.5 2001/02/12 23:13:44 marka Exp";
 #endif
 
 #include "port_before.h"
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/mktemp.c
--- a/dist/bind/lib/bsd/mktemp.c        Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/mktemp.c        Fri Jun 28 11:40:28 2002 +0000
@@ -1,6 +1,8 @@
+/*     $NetBSD: mktemp.c,v 1.1.1.1.2.1 2002/06/28 11:40:55 lukem Exp $ */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)mktemp.c     8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: mktemp.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: mktemp.c,v 8.4 1999/10/13 16:39:21 vixie Exp";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/putenv.c
--- a/dist/bind/lib/bsd/putenv.c        Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/putenv.c        Fri Jun 28 11:40:28 2002 +0000
@@ -1,5 +1,7 @@
+/*     $NetBSD: putenv.c,v 1.1.1.1.2.1 2002/06/28 11:41:03 lukem Exp $ */
+
 #ifndef LINT
-static const char rcsid[] = "$Id: putenv.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: putenv.c,v 8.4 1999/10/13 16:39:21 vixie Exp";
 #endif
 
 #include "port_before.h"
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/readv.c
--- a/dist/bind/lib/bsd/readv.c Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/readv.c Fri Jun 28 11:40:28 2002 +0000
@@ -1,5 +1,7 @@
+/*     $NetBSD: readv.c,v 1.1.1.1.2.1 2002/06/28 11:41:12 lukem Exp $  */
+
 #ifndef LINT
-static const char rcsid[] = "$Id: readv.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: readv.c,v 8.2 1999/10/13 16:39:21 vixie Exp";
 #endif
 
 #include "port_before.h"
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/setenv.c
--- a/dist/bind/lib/bsd/setenv.c        Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/setenv.c        Fri Jun 28 11:40:28 2002 +0000
@@ -1,6 +1,8 @@
+/*     $NetBSD: setenv.c,v 1.1.1.1.2.1 2002/06/28 11:41:20 lukem Exp $ */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)setenv.c     8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: setenv.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: setenv.c,v 8.5 1998/09/16 17:07:09 vixie Exp";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/setitimer.c
--- a/dist/bind/lib/bsd/setitimer.c     Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/setitimer.c     Fri Jun 28 11:40:28 2002 +0000
@@ -1,5 +1,7 @@
+/*     $NetBSD: setitimer.c,v 1.1.1.1.2.1 2002/06/28 11:41:29 lukem Exp $      */
+
 #ifndef LINT
-static const char rcsid[] = "$Id: setitimer.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: setitimer.c,v 8.4 1999/10/13 16:39:21 vixie Exp";
 #endif
 
 #include "port_before.h"
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/strcasecmp.c
--- a/dist/bind/lib/bsd/strcasecmp.c    Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/strcasecmp.c    Fri Jun 28 11:40:28 2002 +0000
@@ -1,6 +1,8 @@
+/*     $NetBSD: strcasecmp.c,v 1.1.1.1.2.1 2002/06/28 11:41:37 lukem Exp $     */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: strcasecmp.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: strcasecmp.c,v 8.5 1999/10/13 16:39:21 vixie Exp";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/strdup.c
--- a/dist/bind/lib/bsd/strdup.c        Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/strdup.c        Fri Jun 28 11:40:28 2002 +0000
@@ -1,3 +1,5 @@
+/*     $NetBSD: strdup.c,v 1.1.1.1.2.1 2002/06/28 11:41:46 lukem Exp $ */
+
 #include "port_before.h"
 
 #include <stdlib.h>
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/strerror.c
--- a/dist/bind/lib/bsd/strerror.c      Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/strerror.c      Fri Jun 28 11:40:28 2002 +0000
@@ -1,6 +1,8 @@
+/*     $NetBSD: strerror.c,v 1.1.1.1.2.1 2002/06/28 11:41:54 lukem Exp $       */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)strerror.c   8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: strerror.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: strerror.c,v 8.7 2001/08/28 11:48:10 marka Exp";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -45,24 +47,34 @@
 
 #include "port_after.h"
 
-extern int sys_nerr;
-extern char *sys_errlist[];
-
 #ifndef NEED_STRERROR
 int __strerror_unneeded__;
 #else
 
+#ifdef USE_SYSERROR_LIST
+extern int sys_nerr;
+extern char *sys_errlist[];
+#endif
+
 const char *
-strerror(int num) {
+isc_strerror(int num) {
 #define        UPREFIX "Unknown error: "
        static char ebuf[40] = UPREFIX;         /* 64-bit number + slop */
        u_int errnum;
        char *p, *t;
+       const char *ret;
        char tmp[40];
 
        errnum = num;                           /* convert to unsigned */
+#ifdef USE_SYSERROR_LIST
        if (errnum < sys_nerr)
                return (sys_errlist[errnum]);
+#else
+#undef strerror
+       ret = strerror(num);                    /* call strerror() in libc */
+       if (ret != NULL)
+               return(ret);
+#endif
 
        /* Do this by hand, so we don't include stdio(3). */
        t = tmp;
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/strpbrk.c
--- a/dist/bind/lib/bsd/strpbrk.c       Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/strpbrk.c       Fri Jun 28 11:40:28 2002 +0000
@@ -1,6 +1,8 @@
+/*     $NetBSD: strpbrk.c,v 1.1.1.1.2.1 2002/06/28 11:42:02 lukem Exp $        */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)strpbrk.c    8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: strpbrk.c,v 1.1.1.1 2001/05/17 22:48:45 itojun Exp $";
+static const char rcsid[] = "Id: strpbrk.c,v 8.4 1999/10/13 16:39:21 vixie Exp";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/strsep.c
--- a/dist/bind/lib/bsd/strsep.c        Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/strsep.c        Fri Jun 28 11:40:28 2002 +0000
@@ -1,6 +1,8 @@
+/*     $NetBSD: strsep.c,v 1.1.1.1.2.1 2002/06/28 11:42:10 lukem Exp $ */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "strsep.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: strsep.c,v 1.1.1.1 2001/05/17 22:48:46 itojun Exp $";
+static const char rcsid[] = "Id: strsep.c,v 8.5 1996/11/18 09:09:04 vixie Exp";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/strtoul.c
--- a/dist/bind/lib/bsd/strtoul.c       Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/strtoul.c       Fri Jun 28 11:40:28 2002 +0000
@@ -1,6 +1,8 @@
+/*     $NetBSD: strtoul.c,v 1.1.1.1.2.1 2002/06/28 11:42:19 lukem Exp $        */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)strtoul.c    8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: strtoul.c,v 1.1.1.1 2001/05/17 22:48:46 itojun Exp $";
+static const char rcsid[] = "Id: strtoul.c,v 8.4 1999/10/13 16:39:21 vixie Exp";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/utimes.c
--- a/dist/bind/lib/bsd/utimes.c        Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/utimes.c        Fri Jun 28 11:40:28 2002 +0000
@@ -1,3 +1,5 @@
+/*     $NetBSD: utimes.c,v 1.1.1.1.2.1 2002/06/28 11:42:27 lukem Exp $ */
+
 /*
  * Copyright (c) 1997,1999 by Internet Software Consortium.
  *
diff -r f9977d3ca79b -r 5583139f625e dist/bind/lib/bsd/writev.c
--- a/dist/bind/lib/bsd/writev.c        Fri Jun 28 11:40:20 2002 +0000
+++ b/dist/bind/lib/bsd/writev.c        Fri Jun 28 11:40:28 2002 +0000
@@ -1,5 +1,7 @@
+/*     $NetBSD: writev.c,v 1.1.1.1.2.1 2002/06/28 11:42:35 lukem Exp $ */
+
 #ifndef LINT
-static const char rcsid[] = "$Id: writev.c,v 1.1.1.1 2001/05/17 22:48:46 itojun Exp $";
+static const char rcsid[] = "Id: writev.c,v 8.5 1999/10/13 16:39:21 vixie Exp";
 #endif
 
 #include "port_before.h"