From 7041e869864c9eb1036640eeb94f3cbb70c230ed Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Fri, 24 Sep 2010 08:31:23 +0000 Subject: [PATCH] update copyright notice --- bin/named/include/named/query.h | 4 ++-- bin/named/server.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h index 5a9bd24cfe..1019b92953 100644 --- a/bin/named/include/named/query.h +++ b/bin/named/include/named/query.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.h,v 1.41 2010/09/24 05:09:02 marka Exp $ */ +/* $Id: query.h,v 1.42 2010/09/24 08:31:23 tbox Exp $ */ #ifndef NAMED_QUERY_H #define NAMED_QUERY_H 1 diff --git a/bin/named/server.c b/bin/named/server.c index 42967757ad..8646f99e3c 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.584 2010/09/24 05:09:02 marka Exp $ */ +/* $Id: server.c,v 1.585 2010/09/24 08:31:23 tbox Exp $ */ /*! \file */ @@ -1445,8 +1445,8 @@ configure_view(dns_view_t *view, cfg_parser_t* parser, } CHECK(configure_view_acl(NULL, ns_g_config, "allow-query", NULL, actx, - ns_g_mctx, &view->queryacl)); - + ns_g_mctx, &view->queryacl)); + /* * Configure the zones. */ @@ -2079,12 +2079,12 @@ configure_view(dns_view_t *view, cfg_parser_t* parser, */ if (view->cacheacl == NULL && view->recursionacl != NULL) dns_acl_attach(view->recursionacl, &view->cacheacl); - /* - * XXXEACH: This call to configure_view_acl() is redundant. We - * are leaving it as it is because we are making a minimal change - * for a patch release. In the future this should be changed to - * dns_acl_attach(view->queryacl, &view->cacheacl). - */ + /* + * XXXEACH: This call to configure_view_acl() is redundant. We + * are leaving it as it is because we are making a minimal change + * for a patch release. In the future this should be changed to + * dns_acl_attach(view->queryacl, &view->cacheacl). + */ if (view->cacheacl == NULL && view->recursion) CHECK(configure_view_acl(vconfig, config, "allow-query", NULL, actx, ns_g_mctx, &view->cacheacl)); @@ -2112,8 +2112,8 @@ configure_view(dns_view_t *view, cfg_parser_t* parser, "allow-query-cache", NULL, actx, ns_g_mctx, &view->cacheacl)); - else - CHECK(dns_acl_none(mctx, &view->cacheacl)); + else + CHECK(dns_acl_none(mctx, &view->cacheacl)); } /*