pullup:

1099.   [cleanup]       libbind: defining REPORT_ERRORS in lib/bind/dst caused
                        compile time errors.

diff --git a/CHANGES b/CHANGES
index d2a365d28386ff20a0eb702dc391b55c13c3c9fb..28f73ea3f4abae3e520fa39c0205cc76b2a7406b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
 1101.  [bug]           Array bounds read error in lwres_gai_strerror.
 
+1099.  [cleanup]       libbind: defining REPORT_ERRORS in lib/bind/dst caused
+                       compile time errors.
+
 1098.  [bug]           libbind: HMAC-MD5 key files are now mode 0600.
 
 1093.  [doc]           libbind: miscellaneous nroff fixes.

diff --git a/lib/bind/dst/dst_api.c b/lib/bind/dst/dst_api.c
index 9ded9c6787497fd0f4ce5255326d9634524cb630..c69004353890c718c2d1211b0674e30f6523439f 100644 (file)
--- a/lib/bind/dst/dst_api.c
+++ b/lib/bind/dst/dst_api.c
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.4.2.1 2001/11/02 21:35:30 gson Exp $";
+static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.4.2.2 2001/11/02 21:38:18 gson Exp $";
 #endif
 
 /*
@@ -431,7 +431,7 @@ dst_s_write_private_key(const DST_KEY *key)
                int nn;
                if ((nn = fwrite(encoded_block, 1, len, fp)) != len) {
                        EREPORT(("dst_write_private_key(): Write failure on %s %d != %d errno=%d\n",
-                                file, out_len, nn, errno));
+                                file, len, nn, errno));
                        return (-5);
                }
                fclose(fp);