From 5cebccfd7e52ed91821613f75540418c6fcd3136 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Thu, 5 May 2016 23:46:25 +0000 Subject: [PATCH] update copyright notice / whitespace --- bin/dnssec/dnssectool.c | 2 +- .../checkconf/bad-options-also-notify.conf | 16 ++++++++++++++++ .../system/checkconf/bad-view-also-notify.conf | 16 ++++++++++++++++ .../checkconf/good-options-also-notify.conf | 16 ++++++++++++++++ .../system/checkconf/good-view-also-notify.conf | 16 ++++++++++++++++ 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/isc/include/isc/platform.h.in | 2 +- lib/isc/unix/file.c | 2 +- 11 files changed, 71 insertions(+), 7 deletions(-) diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 62c42bf45b..75c0c3e56f 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/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/tsig/clean.sh b/bin/tests/system/tsig/clean.sh index 713d777af6..4e5b60683e 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 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2005-2007, 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/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 3fb6e965ed..da8fce556a 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -1749,7 +1749,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 5a450e65e9..ac14b3bda4 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/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in index 99d08ba514..69b49891b6 100644 --- a/lib/isc/include/isc/platform.h.in +++ b/lib/isc/include/isc/platform.h.in @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010, 2013-2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2010, 2013-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/isc/unix/file.c b/lib/isc/unix/file.c index 1013cb5d86..7e9e0dfa2c 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