From 2ded752b7528c958b98dfaf5af90f01d61ef3d5a Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Thu, 23 Feb 2012 07:09:02 +0000 Subject: [PATCH] update copyright notice --- bin/tests/system/inline/ns1/sign.sh | 4 ++-- bin/tests/system/inline/ns2/named.conf | 4 ++-- lib/dns/zone.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/tests/system/inline/ns1/sign.sh b/bin/tests/system/inline/ns1/sign.sh index b4b40bfc9d..b6396262a6 100644 --- a/bin/tests/system/inline/ns1/sign.sh +++ b/bin/tests/system/inline/ns1/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2011, 2012 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 @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: sign.sh,v 1.3.20.1 2012/02/23 07:02:19 marka Exp $ +# $Id: sign.sh,v 1.3.20.2 2012/02/23 07:09:01 tbox Exp $ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/inline/ns2/named.conf b/bin/tests/system/inline/ns2/named.conf index 2dc32ad5a2..9ce6e6fcd9 100644 --- a/bin/tests/system/inline/ns2/named.conf +++ b/bin/tests/system/inline/ns2/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011, 2012 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 @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.138.1 2012/02/23 07:02:19 marka Exp $ */ +/* $Id: named.conf,v 1.2.138.2 2012/02/23 07:09:02 tbox Exp $ */ // NS2 diff --git a/lib/dns/zone.c b/lib/dns/zone.c index c73625fc7f..a7de9b6ef7 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.667.2.4 2012/02/23 07:02:20 marka Exp $ */ +/* $Id: zone.c,v 1.667.2.5 2012/02/23 07:09:02 tbox Exp $ */ /*! \file */ @@ -12541,7 +12541,7 @@ checkandaddsoa(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, RUNTIME_CHECK(result == ISC_R_SUCCESS); dns_rdataset_current(rdataset, &rdata); dns_rdata_tostruct(&rdata, &soa, NULL); - + if (isc_serial_gt(soa.serial, oldserial)) return (dns_db_addrdataset(db, node, version, 0, rdataset, 0, NULL)); @@ -12654,7 +12654,7 @@ receive_secure_db(isc_task_t *task, isc_event_t *event) { if (rdataset.type == dns_rdatatype_soa && have_oldserial) { result = checkandaddsoa(db, node, version, - &rdataset, oldserial); + &rdataset, oldserial); } else result = dns_db_addrdataset(db, node, version, 0, &rdataset, 0,