From: Tinderbox User Date: Wed, 22 Jun 2016 23:45:21 +0000 (+0000) Subject: update copyright notice / whitespace X-Git-Tag: v9.11.0b1~30 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=601645a1e801dc07e7050f0ca9366c5f56271a68;p=thirdparty%2Fbind9.git update copyright notice / whitespace --- diff --git a/bin/named/client.c b/bin/named/client.c index 850d3181653..55ab588e9ee 100644 --- a/bin/named/client.c +++ b/bin/named/client.c @@ -1199,7 +1199,7 @@ client_send(ns_client_t *client) { } #endif /* HAVE_DNSTAP */ - + switch (isc_sockaddr_pf(&client->peeraddr)) { case AF_INET: isc_stats_increment(ns_g_server->tcpoutstats4, diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h index 8cdfe79b316..18c4538e395 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2016 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/bin/tests/system/catz/ns1/named.conf b/bin/tests/system/catz/ns1/named.conf index 521d147a676..f4a628a31c5 100644 --- a/bin/tests/system/catz/ns1/named.conf +++ b/bin/tests/system/catz/ns1/named.conf @@ -64,6 +64,6 @@ zone "catalog4.example" { /* catalog5 is missing on purpose */ key tsig_key. { - secret "LSAnCU+Z"; - algorithm hmac-md5; + secret "LSAnCU+Z"; + algorithm hmac-md5; }; diff --git a/bin/tests/system/catz/ns2/named.conf.in b/bin/tests/system/catz/ns2/named.conf.in index f2ea7cbbb12..b7662c181af 100644 --- a/bin/tests/system/catz/ns2/named.conf.in +++ b/bin/tests/system/catz/ns2/named.conf.in @@ -74,6 +74,6 @@ zone "catalog4.example" { }; key tsig_key. { - secret "LSAnCU+Z"; - algorithm hmac-md5; + secret "LSAnCU+Z"; + algorithm hmac-md5; }; diff --git a/bin/tests/system/statschannel/server-json.pl b/bin/tests/system/statschannel/server-json.pl index 4ffe767d8e2..58c55df6598 100644 --- a/bin/tests/system/statschannel/server-json.pl +++ b/bin/tests/system/statschannel/server-json.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015, 2016 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/bin/tests/system/statschannel/traffic-json.pl b/bin/tests/system/statschannel/traffic-json.pl index a56929e51c8..2e54ad9c05a 100644 --- a/bin/tests/system/statschannel/traffic-json.pl +++ b/bin/tests/system/statschannel/traffic-json.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015, 2016 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/bin/tests/system/statschannel/traffic-xml.pl b/bin/tests/system/statschannel/traffic-xml.pl index 81281b2ed6a..f7622754cfe 100644 --- a/bin/tests/system/statschannel/traffic-xml.pl +++ b/bin/tests/system/statschannel/traffic-xml.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015, 2016 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/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h index eb31af77d8b..a0d71f94bcf 100644 --- a/lib/dns/include/dns/stats.h +++ b/lib/dns/include/dns/stats.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2012, 2014-2016 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/stats.c b/lib/dns/stats.c index 1f2ff849ff2..f500c65824a 100644 --- a/lib/dns/stats.c +++ b/lib/dns/stats.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007-2009, 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007-2009, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -299,7 +299,7 @@ void dns_rcodestats_increment(dns_stats_t *stats, dns_rcode_t code) { REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_rcode); - if (code <= dns_rcode_badcookie) + if (code <= dns_rcode_badcookie) isc_stats_increment(stats->counters, (isc_statscounter_t)code); } diff --git a/lib/isc/random.c b/lib/isc/random.c index 04fd80de083..584ca16f982 100644 --- a/lib/isc/random.c +++ b/lib/isc/random.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2009, 2013, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009, 2013, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any