From e862384f39ea201dfc24564da57eb26979eca90c Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Thu, 5 Oct 2017 23:48:31 +0000 Subject: [PATCH] update copyright notice / whitespace --- bin/named/unix/dlz_dlopen_driver.c | 2 +- bin/tests/system/addzone/clean.sh | 2 +- bin/tests/system/addzone/ns3/named1.conf | 16 ++++++++++++---- bin/tests/system/addzone/ns3/named2.conf | 16 ++++++++++++---- bin/tests/system/addzone/setup.sh | 2 +- bin/tests/system/addzone/tests.sh | 2 +- lib/dns/include/dns/zone.h | 2 +- lib/dns/include/dns/zt.h | 2 +- lib/dns/zt.c | 2 +- 9 files changed, 31 insertions(+), 15 deletions(-) diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c index 8e21a2bea1..7aa0b41ce3 100644 --- a/bin/named/unix/dlz_dlopen_driver.c +++ b/bin/named/unix/dlz_dlopen_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011-2014, 2017 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/addzone/clean.sh b/bin/tests/system/addzone/clean.sh index c306e82732..7be545535d 100644 --- a/bin/tests/system/addzone/clean.sh +++ b/bin/tests/system/addzone/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2010, 2012, 2013, 2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010, 2012, 2013, 2015, 2017 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/addzone/ns3/named1.conf b/bin/tests/system/addzone/ns3/named1.conf index 87da28a1ed..5ba501d36e 100644 --- a/bin/tests/system/addzone/ns3/named1.conf +++ b/bin/tests/system/addzone/ns3/named1.conf @@ -1,9 +1,17 @@ /* - * Copyright (C) 2013, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * 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. */ key rndc_key { diff --git a/bin/tests/system/addzone/ns3/named2.conf b/bin/tests/system/addzone/ns3/named2.conf index 8617c282eb..9dfa891f73 100644 --- a/bin/tests/system/addzone/ns3/named2.conf +++ b/bin/tests/system/addzone/ns3/named2.conf @@ -1,9 +1,17 @@ /* - * Copyright (C) 2013, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * 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. */ key rndc_key { diff --git a/bin/tests/system/addzone/setup.sh b/bin/tests/system/addzone/setup.sh index 2f109ccf2a..daaddecbc8 100644 --- a/bin/tests/system/addzone/setup.sh +++ b/bin/tests/system/addzone/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2010, 2012-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010, 2012-2014, 2017 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/addzone/tests.sh b/bin/tests/system/addzone/tests.sh index 58448e5291..f9767c8825 100755 --- a/bin/tests/system/addzone/tests.sh +++ b/bin/tests/system/addzone/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2010-2013, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010-2013, 2015-2017 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/zone.h b/lib/dns/include/dns/zone.h index 20a3de82cd..87cb936a82 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2013, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2013, 2015-2017 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/zt.h b/lib/dns/include/dns/zt.h index f893a80793..b5afab8556 100644 --- a/lib/dns/include/dns/zt.h +++ b/lib/dns/include/dns/zt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2011, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2011, 2016, 2017 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/lib/dns/zt.c b/lib/dns/zt.c index 6067fde153..c1549adbf2 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2011, 2012, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2011, 2012, 2014, 2016, 2017 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any