From f89adb2c2a52b505501c3eaa2aec9fd4df6bd60a Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Thu, 5 May 2016 23:45:48 +0000 Subject: [PATCH] update copyright notice / whitespace --- CHANGES | 4 ++-- bin/dnssec/dnssectool.c | 2 +- bin/named/Makefile.in | 2 +- bin/named/fuzz.c | 6 +++--- bin/named/include/named/fuzz.h | 2 +- bin/named/include/named/globals.h | 2 +- bin/named/include/named/main.h | 2 +- bin/pkcs11/pkcs11-list.c | 18 +++++++++--------- .../checkconf/bad-options-also-notify.conf | 16 ++++++++++++++++ .../system/checkconf/bad-view-also-notify.conf | 16 ++++++++++++++++ .../checkconf/good-options-also-notify.conf | 16 ++++++++++++++++ .../checkconf/good-view-also-notify.conf | 16 ++++++++++++++++ bin/tests/system/rndc/clean.sh | 2 +- bin/tests/system/rndc/ns6/named.conf.in | 2 +- bin/tests/system/rndc/setup.sh | 2 +- bin/tests/system/rpzrecurse/clean.sh | 2 +- bin/tests/system/rpzrecurse/ns3/example.db | 14 ++++++++++++++ bin/tests/system/rpzrecurse/ns3/named1.conf | 2 +- bin/tests/system/rpzrecurse/ns3/named2.conf | 2 +- bin/tests/system/rpzrecurse/ns3/policy.db | 14 ++++++++++++++ bin/tests/system/rpzrecurse/ns3/root.db | 14 ++++++++++++++ .../system/rpzrecurse/ns4/child.example.db | 14 ++++++++++++++ bin/tests/system/rpzrecurse/setup.sh | 2 +- bin/tests/system/tsig/clean.sh | 2 +- bin/tests/system/tsig/tests.sh | 2 +- lib/bind9/check.c | 2 +- lib/dns/dnssec.c | 2 +- lib/dns/include/dns/resolver.h | 2 +- lib/dns/include/dns/rpz.h | 2 +- lib/isc/include/isc/httpd.h | 2 +- lib/isc/unix/file.c | 2 +- lib/isccfg/namedconf.c | 2 +- 32 files changed, 155 insertions(+), 35 deletions(-) diff --git a/CHANGES b/CHANGES index 4f1fe7b608..4d3cdc7d36 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -4362. [func] Changed rndc reconfig behaviour so that newly added - zones are loaded asynchronously and the loading does +4362. [func] Changed rndc reconfig behaviour so that newly added + zones are loaded asynchronously and the loading does not block the server. [RT #41934] 4361. [cleanup] Where supported, file modification times returned diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index d3ff2e3a63..4cda543218 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2009-2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009-2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001, 2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 69d189dff6..1f4109f6d9 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c index ba06a51910..d8befbbe83 100644 --- a/bin/named/fuzz.c +++ b/bin/named/fuzz.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 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 @@ -252,7 +252,7 @@ fuzz_main_resolver(void *arg) { socklen = sizeof(recvaddr); sent = recvfrom(listenfd, rbuf, 65536, 0, - (struct sockaddr *) &recvaddr, &socklen); + (struct sockaddr *) &recvaddr, &socklen); RUNTIME_CHECK(sent > 0); /* Copy QID and set QR so that response is always processed. */ @@ -261,7 +261,7 @@ fuzz_main_resolver(void *arg) { buf[2] |= 0x80; sent = sendto(listenfd, buf, length, 0, - (struct sockaddr *) &recvaddr, sizeof(recvaddr)); + (struct sockaddr *) &recvaddr, sizeof(recvaddr)); RUNTIME_CHECK(sent == length); /* We might get additional questions here (e.g. for CNAME). */ diff --git a/bin/named/include/named/fuzz.h b/bin/named/include/named/fuzz.h index c7236112c8..2cb183f356 100644 --- a/bin/named/include/named/fuzz.h +++ b/bin/named/include/named/fuzz.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 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/named/include/named/globals.h b/bin/named/include/named/globals.h index ae5c30f511..65ccba9ae7 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.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/named/include/named/main.h b/bin/named/include/named/main.h index aa1fcdb5b5..3274aca6aa 100644 --- a/bin/named/include/named/main.h +++ b/bin/named/include/named/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2009, 2013, 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009, 2013, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/pkcs11/pkcs11-list.c b/bin/pkcs11/pkcs11-list.c index e84f909c01..9800f23728 100644 --- a/bin/pkcs11/pkcs11-list.c +++ b/bin/pkcs11/pkcs11-list.c @@ -5,13 +5,13 @@ * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC AND NETWORK ASSOCIATES DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE - * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. */ /* @@ -173,13 +173,13 @@ main(int argc, char *argv[]) { hSession = pctx.session; - rv = pkcs_C_FindObjectsInit(hSession, search_template, all ? 0 : 1); + rv = pkcs_C_FindObjectsInit(hSession, search_template, all ? 0 : 1); if (rv != CKR_OK) { fprintf(stderr, "C_FindObjectsInit: Error = 0x%.8lX\n", rv); error = 1; goto exit_session; } - + ulObjectCount = 1; while (ulObjectCount) { rv = pkcs_C_FindObjects(hSession, akey, 50, &ulObjectCount); diff --git a/bin/tests/system/checkconf/bad-options-also-notify.conf b/bin/tests/system/checkconf/bad-options-also-notify.conf index 936b6835c0..f3e46f736e 100644 --- a/bin/tests/system/checkconf/bad-options-also-notify.conf +++ b/bin/tests/system/checkconf/bad-options-also-notify.conf @@ -1,3 +1,19 @@ +/* + * Copyright (C) 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 + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + options { also-notify { missing; }; }; diff --git a/bin/tests/system/checkconf/bad-view-also-notify.conf b/bin/tests/system/checkconf/bad-view-also-notify.conf index 8e12d217c1..37cc6c24fa 100644 --- a/bin/tests/system/checkconf/bad-view-also-notify.conf +++ b/bin/tests/system/checkconf/bad-view-also-notify.conf @@ -1,3 +1,19 @@ +/* + * Copyright (C) 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 + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + view example { also-notify { missing; }; zone "example.net" { diff --git a/bin/tests/system/checkconf/good-options-also-notify.conf b/bin/tests/system/checkconf/good-options-also-notify.conf index f676fb7970..de3dfed709 100644 --- a/bin/tests/system/checkconf/good-options-also-notify.conf +++ b/bin/tests/system/checkconf/good-options-also-notify.conf @@ -1,3 +1,19 @@ +/* + * Copyright (C) 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 + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + options { also-notify { missing; }; }; diff --git a/bin/tests/system/checkconf/good-view-also-notify.conf b/bin/tests/system/checkconf/good-view-also-notify.conf index 4692096412..f5ea4058b6 100644 --- a/bin/tests/system/checkconf/good-view-also-notify.conf +++ b/bin/tests/system/checkconf/good-view-also-notify.conf @@ -1,3 +1,19 @@ +/* + * Copyright (C) 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 + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + view example { also-notify { missing; }; zone "example.net" { diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh index 5ade837325..f0e9535d2a 100644 --- a/bin/tests/system/rndc/clean.sh +++ b/bin/tests/system/rndc/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2011-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/rndc/ns6/named.conf.in b/bin/tests/system/rndc/ns6/named.conf.in index 21c745aa78..53a5626fbf 100644 --- a/bin/tests/system/rndc/ns6/named.conf.in +++ b/bin/tests/system/rndc/ns6/named.conf.in @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 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/rndc/setup.sh b/bin/tests/system/rndc/setup.sh index 4276f3f2a4..dbfed115ca 100644 --- a/bin/tests/system/rndc/setup.sh +++ b/bin/tests/system/rndc/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2011-2014, 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/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh index b7e3c5b00f..9973921b14 100644 --- a/bin/tests/system/rpzrecurse/clean.sh +++ b/bin/tests/system/rpzrecurse/clean.sh @@ -1,4 +1,4 @@ -# 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/rpzrecurse/ns3/example.db b/bin/tests/system/rpzrecurse/ns3/example.db index 4970f143ad..fe2436a661 100644 --- a/bin/tests/system/rpzrecurse/ns3/example.db +++ b/bin/tests/system/rpzrecurse/ns3/example.db @@ -1,3 +1,17 @@ +; Copyright (C) 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 +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + $TTL 0 @ SOA . . 0 0 0 0 0 @ NS ns diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf b/bin/tests/system/rpzrecurse/ns3/named1.conf index dabea91624..f13657b1d8 100644 --- a/bin/tests/system/rpzrecurse/ns3/named1.conf +++ b/bin/tests/system/rpzrecurse/ns3/named1.conf @@ -17,7 +17,7 @@ include "../../common/rndc.key"; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; options { diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf b/bin/tests/system/rpzrecurse/ns3/named2.conf index edaebdd532..3675493fee 100644 --- a/bin/tests/system/rpzrecurse/ns3/named2.conf +++ b/bin/tests/system/rpzrecurse/ns3/named2.conf @@ -17,7 +17,7 @@ include "../../common/rndc.key"; controls { - inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; + inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; }; }; options { diff --git a/bin/tests/system/rpzrecurse/ns3/policy.db b/bin/tests/system/rpzrecurse/ns3/policy.db index 9df59b2ac8..fc93be112f 100644 --- a/bin/tests/system/rpzrecurse/ns3/policy.db +++ b/bin/tests/system/rpzrecurse/ns3/policy.db @@ -1,3 +1,17 @@ +; Copyright (C) 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 +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + $TTL 0 @ SOA . . 0 0 0 0 0 @ NS . diff --git a/bin/tests/system/rpzrecurse/ns3/root.db b/bin/tests/system/rpzrecurse/ns3/root.db index 7a66e24ea1..582d201682 100644 --- a/bin/tests/system/rpzrecurse/ns3/root.db +++ b/bin/tests/system/rpzrecurse/ns3/root.db @@ -1,3 +1,17 @@ +; Copyright (C) 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 +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + $TTL 0 @ SOA . . 0 0 0 0 0 @ NS ns diff --git a/bin/tests/system/rpzrecurse/ns4/child.example.db b/bin/tests/system/rpzrecurse/ns4/child.example.db index 1cba37ad5c..c03160adc3 100644 --- a/bin/tests/system/rpzrecurse/ns4/child.example.db +++ b/bin/tests/system/rpzrecurse/ns4/child.example.db @@ -1,3 +1,17 @@ +; Copyright (C) 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 +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + $TTL 0 @ SOA . . 0 0 0 0 0 @ NS ns diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh index 1324942794..ec0442bddc 100644 --- a/bin/tests/system/rpzrecurse/setup.sh +++ b/bin/tests/system/rpzrecurse/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# 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/tsig/clean.sh b/bin/tests/system/tsig/clean.sh index 18d8fc9eb5..3c8b5fe067 100644 --- a/bin/tests/system/tsig/clean.sh +++ b/bin/tests/system/tsig/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2005-2007, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2005-2007, 2012, 2014, 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/tsig/tests.sh b/bin/tests/system/tsig/tests.sh index db38c7e30a..156416f9be 100644 --- a/bin/tests/system/tsig/tests.sh +++ b/bin/tests/system/tsig/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2005-2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2005-2007, 2011, 2012, 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/bind9/check.c b/lib/bind9/check.c index 8bf7120a42..f1f59c3cb3 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -1785,7 +1785,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, tresult = cfg_map_get(voptions, "also-notify", &obj); if (tresult != ISC_R_SUCCESS && goptions != NULL) tresult = cfg_map_get(goptions, "also-notify", &obj); - if (tresult == ISC_R_SUCCESS && donotify) { + if (tresult == ISC_R_SUCCESS && donotify) { isc_uint32_t count; tresult = validate_masters(obj, config, &count, logctx, mctx); diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index 6131f1b3a1..088a87a089 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -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/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index cf3fcb0c4c..bf53ca8930 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.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-2001, 2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h index e8655b75f1..86d0b71413 100644 --- a/lib/dns/include/dns/rpz.h +++ b/lib/dns/include/dns/rpz.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2013, 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011-2013, 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/isc/include/isc/httpd.h b/lib/isc/include/isc/httpd.h index f3f765109d..0e4da41664 100644 --- a/lib/isc/include/isc/httpd.h +++ b/lib/isc/include/isc/httpd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2006-2008, 2014, 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/isc/unix/file.c b/lib/isc/unix/file.c index 88378e495a..ef87fc7636 100644 --- a/lib/isc/unix/file.c +++ b/lib/isc/unix/file.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2009, 2011-2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009, 2011-2016 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/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 9bc8495ecf..8e39a476ea 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2002, 2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any