From: Tinderbox User Date: Tue, 10 Feb 2015 23:46:11 +0000 (+0000) Subject: update copyright notice / whitespace X-Git-Tag: v9.9.7rc2~10 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ae051b2f18a9d3eaac6eda9c727bc08bf340b690;p=thirdparty%2Fbind9.git update copyright notice / whitespace --- diff --git a/CHANGES b/CHANGES index e9989568544..ee7c5d0cbbd 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,7 @@ number generator context. [RT #38578] 4056. [bug] Fixed several small bugs in automatic trust anchor - management, including a memory leak and a possible + management, including a memory leak and a possible loss of key state information. [RT #38458] 4057. [bug] 'dnssec-dsfromkey -T 0' failed to add ttl field. diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh index feeef5536df..0a8ce1de704 100644 --- a/bin/tests/system/dnssec/clean.sh +++ b/bin/tests/system/dnssec/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007-2015 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh index 614b3bb2fd1..5d8bb3bef93 100644 --- a/bin/tests/system/dnssec/ns3/sign.sh +++ b/bin/tests/system/dnssec/ns3/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2004, 2006-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006-2015 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/dnssec/ns5/named1.conf b/bin/tests/system/dnssec/ns5/named1.conf index 1a13a9f7764..8db8ccc51b0 100644 --- a/bin/tests/system/dnssec/ns5/named1.conf +++ b/bin/tests/system/dnssec/ns5/named1.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006, 2007, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/dnssec/ns5/named2.conf b/bin/tests/system/dnssec/ns5/named2.conf index 5b60285e279..a5d2ad0ee28 100644 --- a/bin/tests/system/dnssec/ns5/named2.conf +++ b/bin/tests/system/dnssec/ns5/named2.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006, 2007, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -40,19 +40,19 @@ options { }; view root { - match-destinations { 127.0.0.1; }; + match-destinations { 127.0.0.1; }; - zone "." { - type master; - file "root.db.signed"; - }; + zone "." { + type master; + file "root.db.signed"; + }; }; view other { include "revoked.conf"; - zone "." { - type static-stub; - server-addresses { 127.0.0.1; }; - }; + zone "." { + type static-stub; + server-addresses { 127.0.0.1; }; + }; }; diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh index b376ed007c5..e46626f4caf 100644 --- a/bin/tests/system/dnssec/setup.sh +++ b/bin/tests/system/dnssec/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2004, 2007, 2009, 2011-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009, 2011-2015 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index 03a5f324146..0187bc6718d 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 1890f7c132b..1c113eccb23 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2011-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2011-2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c index bdff137534e..29f129ffbf5 100644 --- a/lib/dns/keytable.c +++ b/lib/dns/keytable.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2013, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009, 2010, 2013-2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c index 1e5741863fa..00cf084eb62 100644 --- a/lib/dns/rdata/generic/keydata_65533.c +++ b/lib/dns/rdata/generic/keydata_65533.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, 2011-2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009, 2011-2013, 2015 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 @@ -200,17 +200,17 @@ totext_keydata(ARGS_TOTEXT) { isc_stdtime_get(&now); - RETERR(str_totext(tctx->linebreak, target)); + RETERR(str_totext(tctx->linebreak, target)); RETERR(str_totext("; next refresh: ", target)); isc_time_set(&t, refresh, 0); isc_time_formathttptimestamp(&t, rbuf, sizeof(rbuf)); RETERR(str_totext(rbuf, target)); if (add == 0) { - RETERR(str_totext(tctx->linebreak, target)); + RETERR(str_totext(tctx->linebreak, target)); RETERR(str_totext("; no trust", target)); } else { - RETERR(str_totext(tctx->linebreak, target)); + RETERR(str_totext(tctx->linebreak, target)); if (add < now) { RETERR(str_totext("; trusted since: ", target)); @@ -225,7 +225,7 @@ totext_keydata(ARGS_TOTEXT) { } if (remove != 0) { - RETERR(str_totext(tctx->linebreak, target)); + RETERR(str_totext(tctx->linebreak, target)); RETERR(str_totext("; removal pending: ", target)); isc_time_set(&t, remove, 0); diff --git a/lib/dns/zone.c b/lib/dns/zone.c index ecd424f4b82..fbaeab14c69 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -8527,7 +8527,7 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) { deletekey = ISC_TRUE; newkey = ISC_TRUE; keydata.removehd = 0; - keydata.addhd = + keydata.addhd = now + dns_zone_mkey_month; } else if (keydata.addhd > now) pending++; diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c index 966b6517486..0c159f069df 100644 --- a/lib/isc/httpd.c +++ b/lib/isc/httpd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008, 2010-2012, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2006-2008, 2010-2012, 2014, 2015 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 diff --git a/lib/isc/tests/time_test.c b/lib/isc/tests/time_test.c index eb56ff9fb65..66836f7feb9 100644 --- a/lib/isc/tests/time_test.c +++ b/lib/isc/tests/time_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2014, 2015 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 diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h index ade55247a93..fd767040aec 100644 --- a/lib/isc/unix/include/isc/time.h +++ b/lib/isc/unix/include/isc/time.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c index ea1ddc0ae03..400bbf8f3be 100644 --- a/lib/isc/unix/time.c +++ b/lib/isc/unix/time.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008, 2011, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008, 2011, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001, 2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h index bfd5bc0d622..5b97c535883 100644 --- a/lib/isc/win32/include/isc/time.h +++ b/lib/isc/win32/include/isc/time.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006-2009, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006-2009, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any