From 62bffa3ef0fdc4c8fa4e719fbacd3e0893e85fb3 Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Thu, 19 May 2011 23:46:30 +0000 Subject: [PATCH] update copyright notice --- lib/dns/include/dns/db.h | 4 ++-- lib/dns/zone.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index 97e3d4beda..2e3d4961f3 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: db.h,v 1.102.8.1 2011/05/19 04:42:18 each Exp $ */ +/* $Id: db.h,v 1.102.8.2 2011/05/19 23:46:30 tbox Exp $ */ #ifndef DNS_DB_H #define DNS_DB_H 1 diff --git a/lib/dns/zone.c b/lib/dns/zone.c index c77d5c91c2..54040914c5 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.540.2.56 2011/05/19 21:28:01 each Exp $ */ +/* $Id: zone.c,v 1.540.2.57 2011/05/19 23:46:29 tbox Exp $ */ /*! \file */ @@ -3611,7 +3611,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, namebuf, typebuf, next.resign - timenow); dns_rdataset_disassociate(&next); - } else + } else dns_zone_log(zone, ISC_LOG_WARNING, "signed dynamic zone has no " "resign event scheduled"); @@ -4623,7 +4623,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } else { /* * At this point, we've got an RRSIG, - * which is signed by an inactive key. + * which is signed by an inactive key. * An administrator needs to provide a new * key/alg, but until that time, we want to * keep the old RRSIG. Resetting the timer @@ -4640,7 +4640,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, recheck); } - /* + /* * log the key id and algorithm of * the inactive key with no replacement */ @@ -4654,7 +4654,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, "Not deleting.", rrsig.keyid, rrsig.algorithm); - zone->log_key_expired_timer = now + + zone->log_key_expired_timer = now + 3600; } }