From: Tinderbox User Date: Thu, 23 Apr 2015 23:45:22 +0000 (+0000) Subject: update copyright notice / whitespace X-Git-Tag: v9.11.0a1~850 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b299727c2ee225eb40b65e87407ef24b05114883;p=thirdparty%2Fbind9.git update copyright notice / whitespace --- diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h index 3e6c03a775c..70649dc2d9a 100644 --- a/bin/named/include/named/query.h +++ b/bin/named/include/named/query.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2010, 2011, 2013, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2010, 2011, 2013-2015 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/named/query.c b/bin/named/query.c index 7aa95ce49bf..608b24ace93 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -6302,7 +6302,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, */ result = dns_name_concatenate(found, dns_rootname, found, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); - + dns_name_copy(found, name, NULL); if (dns_rdataset_isassociated(rdataset)) dns_rdataset_disassociate(rdataset); @@ -7568,7 +7568,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) goto ncache_nxrrset; } tresult = redirect2(client, fname, rdataset, &node, - &db, &version, type); + &db, &version, type); if (tresult == DNS_R_CONTINUE) { client->query.redirect.qtype = qtype; client->query.redirect.rdataset = rdataset; diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh index 83568a8f86a..161d110bdd3 100644 --- a/bin/tests/system/redirect/clean.sh +++ b/bin/tests/system/redirect/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2011-2015 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/redirect/ns3/example.db b/bin/tests/system/redirect/ns3/example.db index 2877e9d878c..ad723103b25 100644 --- a/bin/tests/system/redirect/ns3/example.db +++ b/bin/tests/system/redirect/ns3/example.db @@ -1,4 +1,4 @@ -; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2015 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/redirect/ns3/named.conf b/bin/tests/system/redirect/ns3/named.conf index d8e14054cd7..9a658143dff 100644 --- a/bin/tests/system/redirect/ns3/named.conf +++ b/bin/tests/system/redirect/ns3/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015 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/redirect/ns3/redirect.db b/bin/tests/system/redirect/ns3/redirect.db index 3b4efd716b0..a45245d3c00 100644 --- a/bin/tests/system/redirect/ns3/redirect.db +++ b/bin/tests/system/redirect/ns3/redirect.db @@ -1,4 +1,4 @@ -; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2015 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/redirect/ns3/root.db b/bin/tests/system/redirect/ns3/root.db index 3273989a1dc..1252f5ef120 100644 --- a/bin/tests/system/redirect/ns3/root.db +++ b/bin/tests/system/redirect/ns3/root.db @@ -1,4 +1,4 @@ -; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2015 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/redirect/ns3/sign.sh b/bin/tests/system/redirect/ns3/sign.sh index fe5d562e82c..ea9e4c2647e 100644 --- a/bin/tests/system/redirect/ns3/sign.sh +++ b/bin/tests/system/redirect/ns3/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2011, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015 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/redirect/ns4/example.db.in b/bin/tests/system/redirect/ns4/example.db.in index cf08a09a6be..e58564d72ca 100644 --- a/bin/tests/system/redirect/ns4/example.db.in +++ b/bin/tests/system/redirect/ns4/example.db.in @@ -1,4 +1,4 @@ -; Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2015 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/redirect/ns4/named.conf b/bin/tests/system/redirect/ns4/named.conf index 2d077aa3dcb..c3bb0ee7382 100644 --- a/bin/tests/system/redirect/ns4/named.conf +++ b/bin/tests/system/redirect/ns4/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015 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/redirect/setup.sh b/bin/tests/system/redirect/setup.sh index 388999838a4..de13469c300 100644 --- a/bin/tests/system/redirect/setup.sh +++ b/bin/tests/system/redirect/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2011-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2011-2015 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/redirect/tests.sh b/bin/tests/system/redirect/tests.sh index f2894334c8a..d0e54497d75 100644 --- a/bin/tests/system/redirect/tests.sh +++ b/bin/tests/system/redirect/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2011-2015 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