From: Automatic Updater <source@isc.org>
Date: Tue, 22 Jun 2010 23:46:34 +0000 (+0000)
Subject: update copyright notice
X-Git-Tag: v9.7.1b1^2~76
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=275c562ce71ef5ba9377dd5424953c200965fbde;p=thirdparty%2Fbind9.git

update copyright notice
---

diff --git a/bin/named/config.c b/bin/named/config.c
index 2bb195332ab..240be043ea8 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.106.4.3 2010/06/22 04:02:39 marka Exp $ */
+/* $Id: config.c,v 1.106.4.4 2010/06/22 23:46:34 tbox Exp $ */
 
 /*! \file */
 
@@ -161,7 +161,7 @@ options {\n\
 "
 #ifdef ALLOW_FILTER_AAAA_ON_V4
 "	filter-aaaa-on-v4 no;\n\
- 	filter-aaaa { any; };\n\
+	filter-aaaa { any; };\n\
 "
 #endif
 
diff --git a/bin/named/query.c b/bin/named/query.c
index 15dd9b98bf5..cbf0061d988 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.335.8.4 2010/06/22 04:02:39 marka Exp $ */
+/* $Id: query.c,v 1.335.8.5 2010/06/22 23:46:34 tbox Exp $ */
 
 /*! \file */
 
@@ -4670,7 +4670,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 		    is_v4_client(client) &&
 		    ns_client_checkaclsilent(client, NULL,
 					     client->view->v4_aaaa_acl,
-					     ISC_TRUE) == ISC_R_SUCCESS) 
+					     ISC_TRUE) == ISC_R_SUCCESS)
 			filter_aaaa = ISC_TRUE;
 		else
 			filter_aaaa = ISC_FALSE;
diff --git a/bin/tests/system/testsock6.pl b/bin/tests/system/testsock6.pl
index e481eba165e..aeb3a877ccc 100644
--- a/bin/tests/system/testsock6.pl
+++ b/bin/tests/system/testsock6.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
+# Copyright (C) 2010  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: testsock6.pl,v 1.2.2.3 2010/06/22 04:02:40 marka Exp $
+# $Id: testsock6.pl,v 1.2.2.4 2010/06/22 23:46:34 tbox Exp $
 
 # Test whether the interfaces on 10.53.0.* are up.
 
@@ -47,7 +46,7 @@ foreach $addr ($ARGV) {
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: testsock6.pl,v 1.2.2.3 2010/06/22 04:02:40 marka Exp $
+# $Id: testsock6.pl,v 1.2.2.4 2010/06/22 23:46:34 tbox Exp $
 
 # Test whether the interfaces on 10.53.0.* are up.
 
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index fd074bab85b..85f1c81586a 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.114.4.3 2010/06/22 04:02:44 marka Exp $ */
+/* $Id: check.c,v 1.114.4.4 2010/06/22 23:46:34 tbox Exp $ */
 
 /*! \file */
 
@@ -518,8 +518,8 @@ check_filteraaaa(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions,
 	else if (cfg_obj_isboolean(obj))
 		filter = cfg_obj_asboolean(obj) ? dns_v4_aaaa_filter :
 						  dns_v4_aaaa_ok;
-	else 
-		filter = dns_v4_aaaa_break_dnssec; 	/* break-dnssec */	
+	else
+		filter = dns_v4_aaaa_break_dnssec; 	/* break-dnssec */
 
 	if (viewname == NULL) {
 		viewname = "";