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

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

details:   https://anonhg.NetBSD.org/src/rev/b427a1f10f4e
branches:  netbsd-1-6
changeset: 528128:b427a1f10f4e
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:29:39 2002 +0000

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

diffstat:

 dist/bind/bin/named/db_dump.c |  21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r a166274f3aec -r b427a1f10f4e dist/bind/bin/named/db_dump.c
--- a/dist/bind/bin/named/db_dump.c     Fri Jun 28 11:29:29 2002 +0000
+++ b/dist/bind/bin/named/db_dump.c     Fri Jun 28 11:29:39 2002 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: db_dump.c,v 1.5 2001/05/17 22:59:39 itojun Exp $       */
+/*     $NetBSD: db_dump.c,v 1.5.2.1 2002/06/28 11:29:39 lukem Exp $    */
 
 #if !defined(lint) && !defined(SABER)
 static const char sccsid[] = "@(#)db_dump.c    4.33 (Berkeley) 3/3/91";
-static const char rcsid[] = "Id: db_dump.c,v 8.49 2001/02/06 06:42:19 marka Exp";
+static const char rcsid[] = "Id: db_dump.c,v 8.51 2001/06/18 14:42:49 marka Exp";
 #endif /* not lint */
 
 /*
@@ -122,6 +122,7 @@
 
 #include <isc/eventlib.h>
 #include <isc/logging.h>
+#include <isc/misc.h>
 
 #include "port_after.h"
 
@@ -179,7 +180,8 @@
 
        fprintf(fp, ";; ++zone table++\n");
        for (zp = &zones[0]; zp < &zones[nzones]; zp++) {
-               char *pre, buf[64];
+               const char *pre;
+               char buf[64];
                u_int cnt;
 
                if (!zp->z_origin)
@@ -232,7 +234,7 @@
 }
 
 int
-db_dump(struct hashbuf *htp, FILE *fp, int zone, char *origin) {
+db_dump(struct hashbuf *htp, FILE *fp, int zone, const char *origin) {
        struct databuf *dp = NULL;
        struct namebuf *np;
        struct namebuf **npp, **nppend;
@@ -623,9 +625,14 @@
                                break;
 
                        default:
-                               fprintf(fp, "%s?d_type=%d?",
-                                       sep, dp->d_type);
-                               sep = " ";
+                               fprintf(fp, "\\# %u", dp->d_size);
+                               if (dp->d_size != 0) {
+                                       fputs(" ( ", fp);
+                                       isc_puthexstring(fp, dp->d_data,
+                                                        dp->d_size, 40, 48,
+                                                        "\n\t\t\t\t");
+                                       fputs(" ) ", fp);
+                               }
                        }
                        if (dp->d_cred < DB_C_ZONE) {
                                fprintf(fp, "%sCr=%s",