From: Tinderbox User Date: Fri, 27 May 2016 23:45:23 +0000 (+0000) Subject: update copyright notice / whitespace X-Git-Tag: v9.11.0a3~26 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=262bebd08115b2914ee3ae1612d6db480cbcae80;p=thirdparty%2Fbind9.git update copyright notice / whitespace --- diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh index fd6e1946816..d5a04d2c4ae 100644 --- a/bin/tests/system/checkzone/tests.sh +++ b/bin/tests/system/checkzone/tests.sh @@ -1,4 +1,4 @@ -# 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/checkzone/zones/crashzone.db b/bin/tests/system/checkzone/zones/crashzone.db index 2db33048533..829d1b4dbb1 100644 --- a/bin/tests/system/checkzone/zones/crashzone.db +++ b/bin/tests/system/checkzone/zones/crashzone.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. + dyn.example.net. 7200 IN SOA ns1.example.net. hostmaster.example.net. ( 6 ; serial 43200 ; refresh (12 hours) diff --git a/bin/tests/system/zero/ans5/ans.pl b/bin/tests/system/zero/ans5/ans.pl index 9dfa18e4443..0d0fd318f97 100644 --- a/bin/tests/system/zero/ans5/ans.pl +++ b/bin/tests/system/zero/ans5/ans.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# 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/zero/ns1/root.db b/bin/tests/system/zero/ns1/root.db index beb97cb693e..7a6c6672e24 100644 --- a/bin/tests/system/zero/ns1/root.db +++ b/bin/tests/system/zero/ns1/root.db @@ -1,4 +1,4 @@ -; Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2013, 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/zero/tests.sh b/bin/tests/system/zero/tests.sh index da1d7cf94b8..7dd3d78cb2d 100644 --- a/bin/tests/system/zero/tests.sh +++ b/bin/tests/system/zero/tests.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2013, 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/rbtdb.c b/lib/dns/rbtdb.c index 6b3e9ced945..a0895deaaad 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -6659,7 +6659,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) { newheader->attributes |= RDATASET_ATTR_RESIGN; newheader->resign = - dns_time64_from32(rdataset->resign) >> 1; + dns_time64_from32(rdataset->resign) >> 1; newheader->resign_lsb = rdataset->resign & 0x1; } else { newheader->resign = 0;