pullup:

1052.  [bug]           Journals were not being created in binary mode
                       resulting in "journal format not recognized" error
                       under Windows NT/2000.  [RT #1889]

diff --git a/CHANGES b/CHANGES
index 717dc34188cc60f973e787383cf4b01ae4beeec0..a387c6c746cfa1095ce0112ad7957dccb5ca7aa1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1052.  [bug]           Journals were not being created in binary mode
+                       resulting in "journal format not recognized" error
+                       under Windows NT/2000.  [RT #1889]
+
 1051.  [bug]           Do not ignore a network interface completely just
                        because it has a noncontiguous netmask.  Instead,
                        omit it from the localnets ACL and issue a warning.

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 6077e6edcc799b163fe3174030ffc4c2bf1a2814..6f7118ebd3b7ba5ab4ec6a6ba6aa55ee1c91f3e2 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.c,v 1.71.2.1 2001/01/09 22:43:40 bwelling Exp $ */
+/* $Id: journal.c,v 1.71.2.2 2001/10/15 05:01:03 marka Exp $ */
 
 #include <config.h>
 
@@ -515,7 +515,7 @@ journal_file_create(isc_mem_t *mctx, const char *filename) {
 
        INSIST(sizeof(journal_rawheader_t) == JOURNAL_HEADER_SIZE);
 
-       result = isc_stdio_open(filename, "w", &fp);
+       result = isc_stdio_open(filename, "wb", &fp);
        if (result != ISC_R_SUCCESS) {
                isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
                              "%s: create: %s",