2582. [bug] Don't emit warning log message when we attempt to

                        remove non-existant journal. [RT #19516]

diff --git a/CHANGES b/CHANGES
index ecbe7988fe5bf9e245b9aa81a7ca9ca49ba2d751..05e0a1f48f58e09277a278a4f2d9a7d5377c6161 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2582.  [bug]           Don't emit warning log message when we attempt to
+                       remove non-existant journal. [RT #19516]
+
 2581.  [contrib]       dlz/mysql set MYSQL_OPT_RECONNECT option on connection.
                        Requires MySQL 5.0.19 or later. [RT #19084]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 12ad3f0f56105f551fddbd683447aa69a1cbda4d..f8f44939fc6583e450245836695c6cc2e0b84e82 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.488 2009/03/13 01:35:18 marka Exp $ */
+/* $Id: zone.c,v 1.489 2009/03/26 22:51:54 marka Exp $ */
 
 /*! \file */
 
@@ -9560,7 +9560,7 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
                        isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
                                      DNS_LOGMODULE_ZONE, ISC_LOG_DEBUG(3),
                                      "removing journal file");
-                       if (remove(zone->journal) < 0) {
+                       if (remove(zone->journal) < 0 && errno != ENOENT) {
                                char strbuf[ISC_STRERRORSIZE];
                                isc__strerror(errno, strbuf, sizeof(strbuf));
                                isc_log_write(dns_lctx,