From b61690dbadef1bd32a84f0289abe862485979239 Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Tue, 22 Jun 2010 23:46:52 +0000 Subject: [PATCH] update copyright notice --- bin/named/config.c | 4 ++-- bin/named/query.c | 4 ++-- bin/tests/system/testsock6.pl | 7 +++---- lib/bind9/check.c | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/bin/named/config.c b/bin/named/config.c index 55c5e74b06..c195e108ed 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.c,v 1.109 2010/06/22 03:58:35 marka Exp $ */ +/* $Id: config.c,v 1.110 2010/06/22 23:46:52 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 d0e0ef504b..8df42d3eaa 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.339 2010/06/22 03:58:36 marka Exp $ */ +/* $Id: query.c,v 1.340 2010/06/22 23:46:52 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 15ca0c7fbe..35f63e62cd 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.4 2010/06/22 03:58:36 marka Exp $ +# $Id: testsock6.pl,v 1.5 2010/06/22 23:46:52 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.4 2010/06/22 03:58:36 marka Exp $ +# $Id: testsock6.pl,v 1.5 2010/06/22 23:46:52 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 915a138cd4..c0c957d5ff 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check.c,v 1.117 2010/06/22 03:58:38 marka Exp $ */ +/* $Id: check.c,v 1.118 2010/06/22 23:46:52 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 = "";