From: Automatic Updater Date: Tue, 25 Oct 2011 23:46:58 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.9.0b1~2^2~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=329eb05c120bbd6fd611ad02b32a4c3273e38202;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/bin/tests/system/inline/ns1/root.db.in b/bin/tests/system/inline/ns1/root.db.in index cb62f429344..b4a1a2dc3fb 100644 --- a/bin/tests/system/inline/ns1/root.db.in +++ b/bin/tests/system/inline/ns1/root.db.in @@ -1,5 +1,4 @@ -; Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") -; Copyright (C) 2000, 2001 Internet Software Consortium. +; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") ; ; Permission to use, copy, modify, and/or distribute this software for any ; purpose with or without fee is hereby granted, provided that the above @@ -13,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db.in,v 1.2 2011/10/25 01:54:20 marka Exp $ +; $Id: root.db.in,v 1.3 2011/10/25 23:46:58 tbox Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 9e2bfc8bc7f..1e041f65662 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.638 2011/10/25 04:38:14 marka Exp $ */ +/* $Id: zone.c,v 1.639 2011/10/25 23:46:58 tbox Exp $ */ /*! \file */ @@ -15362,7 +15362,7 @@ keydone(isc_task_t *task, isc_event_t *event) { dns_result_totext(result)); goto failure; } - } + } ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read); if (db == NULL) goto failure; @@ -15394,7 +15394,7 @@ keydone(isc_task_t *task, isc_event_t *event) { &zone->origin, rdataset.ttl, &rdata)); dns_rdata_reset(&rdata); } - + if (!ISC_LIST_EMPTY(diff.tuples)) { /* Write changes to journal file. */ CHECK(update_soa_serial(db, newver, &diff, zone->mctx,