update copyright notice

diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h
index b5bb461f1ac90b9bf6050fdde7881bbd10ed48bb..6dfe96bc9d4dbe162987c02848ee1120dfb2febf 100644 (file)
--- a/bin/named/include/named/query.h
+++ b/bin/named/include/named/query.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2010, 2011  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.44 2011/01/13 01:59:25 marka Exp $ */
+/* $Id: query.h,v 1.45 2011/01/13 04:59:24 tbox Exp $ */
 
 #ifndef NAMED_QUERY_H
 #define NAMED_QUERY_H 1

diff --git a/bin/named/query.c b/bin/named/query.c
index 05f3617c3aa8086c7fc85d1c4d9d10f219990dcf..ef1b7415efe0f750d6ceea3e68329a6b4bf957d8 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  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.c,v 1.351 2011/01/13 01:59:25 marka Exp $ */
+/* $Id: query.c,v 1.352 2011/01/13 04:59:24 tbox Exp $ */
 
 /*! \file */
 
@@ -4970,40 +4970,40 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                 */
                want_restart = ISC_FALSE;
 
-                rpz_st = client->query.rpz_st;
-                if (rpz_st != NULL &&
+               rpz_st = client->query.rpz_st;
+               if (rpz_st != NULL &&
                    (rpz_st->state & DNS_RPZ_RECURSING) != 0) {
-                        is_zone = rpz_st->q.is_zone;
-                        authoritative = rpz_st->q.authoritative;
-                        zone = rpz_st->q.zone;
-                        rpz_st->q.zone = NULL;
-                        node = rpz_st->q.node;
-                        rpz_st->q.node = NULL;
-                        db = rpz_st->q.db;
-                        rpz_st->q.db = NULL;
-                        rdataset = rpz_st->q.rdataset;
-                        rpz_st->q.rdataset = NULL;
-                        sigrdataset = rpz_st->q.sigrdataset;
-                        rpz_st->q.sigrdataset = NULL;
-                        qtype = rpz_st->q.qtype;
- 
-                        if (event->node != NULL)
-                                dns_db_detachnode(db, &event->node);
-                        rpz_st->ns.db = event->db;
-                        rpz_st->ns.r_type = event->qtype;
-                        rpz_st->ns.r_rdataset = event->rdataset;
-                        if (event->sigrdataset != NULL &&
-                            dns_rdataset_isassociated(event->sigrdataset))
-                                dns_rdataset_disassociate(event->sigrdataset);
-                } else {
-                        authoritative = ISC_FALSE;
- 
-                        qtype = event->qtype;
-                        db = event->db;
-                        node = event->node;
-                        rdataset = event->rdataset;
-                        sigrdataset = event->sigrdataset;
-                }
+                       is_zone = rpz_st->q.is_zone;
+                       authoritative = rpz_st->q.authoritative;
+                       zone = rpz_st->q.zone;
+                       rpz_st->q.zone = NULL;
+                       node = rpz_st->q.node;
+                       rpz_st->q.node = NULL;
+                       db = rpz_st->q.db;
+                       rpz_st->q.db = NULL;
+                       rdataset = rpz_st->q.rdataset;
+                       rpz_st->q.rdataset = NULL;
+                       sigrdataset = rpz_st->q.sigrdataset;
+                       rpz_st->q.sigrdataset = NULL;
+                       qtype = rpz_st->q.qtype;
+
+                       if (event->node != NULL)
+                               dns_db_detachnode(db, &event->node);
+                       rpz_st->ns.db = event->db;
+                       rpz_st->ns.r_type = event->qtype;
+                       rpz_st->ns.r_rdataset = event->rdataset;
+                       if (event->sigrdataset != NULL &&
+                           dns_rdataset_isassociated(event->sigrdataset))
+                               dns_rdataset_disassociate(event->sigrdataset);
+               } else {
+                       authoritative = ISC_FALSE;
+
+                       qtype = event->qtype;
+                       db = event->db;
+                       node = event->node;
+                       rdataset = event->rdataset;
+                       sigrdataset = event->sigrdataset;
+               }
 
                if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig)
                        type = dns_rdatatype_any;
@@ -5043,7 +5043,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                        QUERY_ERROR(DNS_R_SERVFAIL);
                        goto cleanup;
                }
-               if (rpz_st != NULL && 
+               if (rpz_st != NULL &&
                    (rpz_st->state & DNS_RPZ_RECURSING) != 0) {
                        rpz_st->ns.r_result = event->result;
                        result = rpz_st->q.result;
@@ -5574,7 +5574,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                                else
                                        result = query_recurse(client, qtype,
                                                         client->query.qname,
-                                                        fname, rdataset,
+                                                        fname, rdataset,
                                                         resuming);
 
                                if (result == ISC_R_SUCCESS) {
@@ -6713,7 +6713,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                        INSIST(line >= 0);
                        query_error(client, eresult, line);
                }
-               ns_client_detach(&client);
+               ns_client_detach(&client);
        } else if (!RECURSING(client)) {
                /*
                 * We are done.  Set up sortlist data for the message

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 0d171e319ffda332f4f67c06afbc011ce7168b2a..6db22d1018a45075cc905c4d3915664d2a0cc4d9 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.34 2011/01/13 01:59:25 marka Exp $
+# $Id: Makefile.in,v 1.35 2011/01/13 04:59:24 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/system/README b/bin/tests/system/README
index 8f63e5f740f60e092fd5059b0255827bfeedd875..dbca6083dedf8b4ac3ea0c385776394013cce467 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -1,4 +1,4 @@
-Copyright (C) 2004, 2010  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2000, 2001  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
@@ -58,4 +58,4 @@ The tests can be run individually like this:
 
 To run all the tests, just type "make test".
 
-$Id: README,v 1.15 2011/01/13 01:59:25 marka Exp $
+$Id: README,v 1.16 2011/01/13 04:59:24 tbox Exp $

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index d3e80266a0ca9929d286b6d92cd9ea40c1c36789..c510da744579abb6769f6e4f8a647228ddd5ff23 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: conf.sh.in,v 1.58 2011/01/13 01:59:26 marka Exp $
+# $Id: conf.sh.in,v 1.59 2011/01/13 04:59:24 tbox Exp $
 
 #
 # Common configuration data for system tests, to be sourced into

diff --git a/bin/tests/system/rpz/Makefile.in b/bin/tests/system/rpz/Makefile.in
index 557e8ac4c298b181eeae6802ab95a8224a8bf40b..5d3f0c225fd48889a2ef090fe8f3796b9bc80e23 100644 (file)
--- a/bin/tests/system/rpz/Makefile.in
+++ b/bin/tests/system/rpz/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  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
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2011/01/13 01:59:26 marka Exp $
+# $Id: Makefile.in,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/system/rpz/clean.sh b/bin/tests/system/rpz/clean.sh
index bc8ec846c4102e6b2e093d92dfcdaf27e2599028..2ef3d3e3127a43fee4d29bb2f686cac9862cb7fe 100644 (file)
--- a/bin/tests/system/rpz/clean.sh
+++ b/bin/tests/system/rpz/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  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
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.2 2011/01/13 01:59:26 marka Exp $
+# $Id: clean.sh,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 
 # Clean up after rpz tests.

diff --git a/bin/tests/system/rpz/ns1/named.conf b/bin/tests/system/rpz/ns1/named.conf
index 731818075ec6bb41c0f7a1cc8e786fb2d9bb45e9..82de8029d534929f8a48eb5c457e89f03a528181 100644 (file)
--- a/bin/tests/system/rpz/ns1/named.conf
+++ b/bin/tests/system/rpz/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2011/01/13 01:59:26 marka Exp $ */
+/* $Id: named.conf,v 1.3 2011/01/13 04:59:24 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/rpz/ns1/root.db b/bin/tests/system/rpz/ns1/root.db
index 86fc1b66596499cdc6bd4056f1e45b1315319774..36fd7ab6e7569fa8ee48bc30b028be2627124ee6 100644 (file)
--- a/bin/tests/system/rpz/ns1/root.db
+++ b/bin/tests/system/rpz/ns1/root.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.2 2011/01/13 01:59:26 marka Exp $
+; $Id: root.db,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 $TTL   120
 @              SOA     s1. hostmaster.ns.s1. ( 1 3600 1200 604800 60 )

diff --git a/bin/tests/system/rpz/ns2/hints b/bin/tests/system/rpz/ns2/hints
index 66ce619b26275ef53dcfa7a5eb4ccef6a15fdd0c..e6ad8425d668ee5ef7c673e7b81260fb3caec4a9 100644 (file)
--- a/bin/tests/system/rpz/ns2/hints
+++ b/bin/tests/system/rpz/ns2/hints
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: hints,v 1.2 2011/01/13 01:59:26 marka Exp $
+; $Id: hints,v 1.3 2011/01/13 04:59:25 tbox Exp $
 
 .      0       NS      s1.
 s1.    0       A       10.53.0.1

diff --git a/bin/tests/system/rpz/ns2/named.conf b/bin/tests/system/rpz/ns2/named.conf
index e3aef74c02b1b901a1b0b325b61c566794c3990d..5de1d51e7cea905b37f9454e93cb0f6cbca80c2f 100644 (file)
--- a/bin/tests/system/rpz/ns2/named.conf
+++ b/bin/tests/system/rpz/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2011/01/13 01:59:26 marka Exp $ */
+/* $Id: named.conf,v 1.3 2011/01/13 04:59:25 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/rpz/ns2/tld2.db b/bin/tests/system/rpz/ns2/tld2.db
index cd2b37d6845df0ec63b94f1fb3dc29ac46f322f4..224f5e419070515523471a829594edc03718d109 100644 (file)
--- a/bin/tests/system/rpz/ns2/tld2.db
+++ b/bin/tests/system/rpz/ns2/tld2.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: tld2.db,v 1.2 2011/01/13 01:59:26 marka Exp $
+; $Id: tld2.db,v 1.3 2011/01/13 04:59:25 tbox Exp $
 
 ; RPZ rewrite responses from this zone
 

diff --git a/bin/tests/system/rpz/ns3/base.db b/bin/tests/system/rpz/ns3/base.db
index 7b4e4b2066adc1e9c457cc2037df883a7792af11..f750399f7f017ccf2593bf1c342f967eeb3db11e 100644 (file)
--- a/bin/tests/system/rpz/ns3/base.db
+++ b/bin/tests/system/rpz/ns3/base.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: base.db,v 1.2 2011/01/13 01:59:26 marka Exp $
+; $Id: base.db,v 1.3 2011/01/13 04:59:25 tbox Exp $
 
 ; RPZ test
 

diff --git a/bin/tests/system/rpz/ns3/hints b/bin/tests/system/rpz/ns3/hints
index a47fc1639f647e804bbd85ab3f265407724ac16a..e6ad8425d668ee5ef7c673e7b81260fb3caec4a9 100644 (file)
--- a/bin/tests/system/rpz/ns3/hints
+++ b/bin/tests/system/rpz/ns3/hints
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: hints,v 1.2 2011/01/13 01:59:27 marka Exp $
+; $Id: hints,v 1.3 2011/01/13 04:59:25 tbox Exp $
 
 .      0       NS      s1.
 s1.    0       A       10.53.0.1

diff --git a/bin/tests/system/rpz/ns3/named.conf b/bin/tests/system/rpz/ns3/named.conf
index 3d377ddf53a1b952d6cf55cb208a9434e6f64e05..b3483cbc4419beb6ee907b765cc94cccb9d2b744 100644 (file)
--- a/bin/tests/system/rpz/ns3/named.conf
+++ b/bin/tests/system/rpz/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2011/01/13 01:59:27 marka Exp $ */
+/* $Id: named.conf,v 1.3 2011/01/13 04:59:25 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/rpz/rpz.c b/bin/tests/system/rpz/rpz.c
index a9d35a6dc8bcfcfcf2f41346592ec05d44f1109d..f1dd3261f19fc5400c814cfe060abfb1a2135ae5 100644 (file)
--- a/bin/tests/system/rpz/rpz.c
+++ b/bin/tests/system/rpz/rpz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rpz.c,v 1.2 2011/01/13 01:59:26 marka Exp $ */
+/* $Id: rpz.c,v 1.3 2011/01/13 04:59:24 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index 8b0f878e372b934d11a8f186a6f4d645ff0952b1..1d74dcfdbb14880d5987d60ea4ddd2e5539b3b01 100644 (file)
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  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
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.2 2011/01/13 01:59:26 marka Exp $
+# $Id: setup.sh,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 sh clean.sh
 

diff --git a/bin/tests/system/rpz/test1 b/bin/tests/system/rpz/test1
index ec3bb954294838951db35e7e3e56e7be7a7fcaaa..0afdf9392f6654f5670962dc3ae3405b1dd557af 100644 (file)
--- a/bin/tests/system/rpz/test1
+++ b/bin/tests/system/rpz/test1
@@ -1,3 +1,17 @@
+# Copyright (C) 2011  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.
+
 ; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +26,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: test1,v 1.2 2011/01/13 01:59:26 marka Exp $
+; $Id: test1,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 
 server 10.53.0.3 5300

diff --git a/bin/tests/system/rpz/test2 b/bin/tests/system/rpz/test2
index 57565d026165a72a9f9f48b587503db4e6c5a3cf..485d53d0b0ffb1f0d221e6b84e5f662c2add537c 100644 (file)
--- a/bin/tests/system/rpz/test2
+++ b/bin/tests/system/rpz/test2
@@ -1,3 +1,17 @@
+# Copyright (C) 2011  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.
+
 ; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +26,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: test2,v 1.2 2011/01/13 01:59:26 marka Exp $
+; $Id: test2,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 
 server 10.53.0.3 5300

diff --git a/bin/tests/system/rpz/test3 b/bin/tests/system/rpz/test3
index fa37e015ccd431ed9e5b9eab538eeb2ea98a463e..8eff5e3e19476d0f04595da6fadeb76a8ffcd44f 100644 (file)
--- a/bin/tests/system/rpz/test3
+++ b/bin/tests/system/rpz/test3
@@ -1,3 +1,17 @@
+# Copyright (C) 2011  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.
+
 ; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +26,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: test3,v 1.2 2011/01/13 01:59:26 marka Exp $
+; $Id: test3,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 
 server 10.53.0.3 5300

diff --git a/bin/tests/system/rpz/test4 b/bin/tests/system/rpz/test4
index 86c3cee59666b194571aa49df649790942d38c47..055c0937eeffbd2a63f509653e2b5c1becbfff86 100644 (file)
--- a/bin/tests/system/rpz/test4
+++ b/bin/tests/system/rpz/test4
@@ -1,3 +1,17 @@
+# Copyright (C) 2011  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.
+
 ; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +26,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: test4,v 1.2 2011/01/13 01:59:26 marka Exp $
+; $Id: test4,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 
 server 10.53.0.3 5300

diff --git a/bin/tests/system/rpz/test5 b/bin/tests/system/rpz/test5
index fff20e5826c448ae36df218f61bf3afef6d0a10d..2698a712021b29f0eed8c025aa720ec01c133dcb 100644 (file)
--- a/bin/tests/system/rpz/test5
+++ b/bin/tests/system/rpz/test5
@@ -1,3 +1,17 @@
+# Copyright (C) 2011  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.
+
 ; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +26,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: test5,v 1.2 2011/01/13 01:59:26 marka Exp $
+; $Id: test5,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 
 server 10.53.0.3 5300

diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 6e59a0588cb75591abd58462c7b5093c4ff2306f..aeef0ce45797615a50d245e22b23eb0e76d21b42 100644 (file)
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  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
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.2 2011/01/13 01:59:26 marka Exp $
+# $Id: tests.sh,v 1.3 2011/01/13 04:59:24 tbox Exp $
 
 # test response policy zones (RPZ)
 

diff --git a/lib/dns/db.c b/lib/dns/db.c
index 133891188a58f2ce6768aa07ff25b326a27cb1e0..698bb91b389fda7982b006ff336833a35cd4d03c 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.c,v 1.96 2011/01/13 01:59:27 marka Exp $ */
+/* $Id: db.c,v 1.97 2011/01/13 04:59:25 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 07d94dcae0c560018903659dda452e10077f160a..bc985536282afe828ae87c41bcd544f2eb6b57b0 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.h,v 1.103 2011/01/13 01:59:28 marka Exp $ */
+/* $Id: db.h,v 1.104 2011/01/13 04:59:25 tbox Exp $ */
 
 #ifndef DNS_DB_H
 #define DNS_DB_H 1

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index bf8ba35cb57a5073bda2a6183a7d353b78fa2516..bef86931877c3e3bfe456580d0909fc79b360d11 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.136 2011/01/13 01:59:28 marka Exp $ */
+/* $Id: name.h,v 1.137 2011/01/13 04:59:26 tbox Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1

diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index 3533c76c975d7bd53095df66cac9645af0ea6e67..7fa702b83980a5c2fe2417816594663bda769342 100644 (file)
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rpz.h,v 1.2 2011/01/13 01:59:28 marka Exp $ */
+/* $Id: rpz.h,v 1.3 2011/01/13 04:59:26 tbox Exp $ */
 
 #ifndef DNS_RPZ_H
 #define DNS_RPZ_H 1
@@ -150,10 +150,10 @@ typedef struct {
 const char *
 dns_rpz_type2str(dns_rpz_type_t type);
 
-dns_rpz_policy_t 
+dns_rpz_policy_t
 dns_rpz_str2policy(const char *str);
 
-void 
+void
 dns_rpz_set_need(isc_boolean_t need);
 
 isc_boolean_t

diff --git a/lib/dns/name.c b/lib/dns/name.c
index 0a18c8367761f8a70f853ad8a4a0709f99551edf..85fa142f847a52ff0dda42e0b493b5d5c0c2cbc5 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.173 2011/01/13 01:59:27 marka Exp $ */
+/* $Id: name.c,v 1.174 2011/01/13 04:59:25 tbox Exp $ */
 
 /*! \file */
 
@@ -2402,7 +2402,7 @@ dns_name_fromstring(dns_name_t *target, const char *src, unsigned int options,
 isc_result_t
 dns_name_fromstring2(dns_name_t *target, const char *src,
                     const dns_name_t *origin, unsigned int options,
-                     isc_mem_t *mctx)
+                    isc_mem_t *mctx)
 {
        isc_result_t result;
        isc_buffer_t buf;

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 0c0f69e6902e7b2e182d445e695f018804700b7a..a843e72fa941b0d25b3688374a4b380459dc1ba8 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.308 2011/01/13 01:59:27 marka Exp $ */
+/* $Id: rbtdb.c,v 1.309 2011/01/13 04:59:25 tbox Exp $ */
 
 /*! \file */
 
@@ -4610,7 +4610,7 @@ rpz_findips(dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type,
                }
 
                result = dns_rpz_cidr_find(rbtdb->rpz_cidr, &netaddr, rpz_type,
-                                          selfname, qname, &prefix);
+                                          selfname, qname, &prefix);
                if (result != ISC_R_SUCCESS)
                        continue;
 
@@ -4663,7 +4663,7 @@ rpz_findips(dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type,
                                rpz_policy = DNS_RPZ_POLICY_RECORD;
                        } else {
                                rpz_policy = dns_rpz_decode_cname(&zrdataset,
-                                                                 selfname);
+                                                                 selfname);
                                if (rpz_policy == DNS_RPZ_POLICY_RECORD)
                                        result = DNS_R_CNAME;
                        }

diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 1dc83316783c5a0e2d84bd13439cb7cf7568cc99..f61d9e87cf27ad7d392bef40bb3e787bd79b48c0 100644 (file)
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.208 2011/01/13 00:55:49 marka Exp $ */
+/* $Id: rdata.c,v 1.209 2011/01/13 04:59:25 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c
index 784c1572434ee1adeef59ce96fab2bb92feb4890..5a5140f8ddd6f9e4654dd4532f960d9727dc8321 100644 (file)
--- a/lib/dns/rdata/generic/hip_55.c
+++ b/lib/dns/rdata/generic/hip_55.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hip_55.c,v 1.7 2011/01/13 00:55:49 marka Exp $ */
+/* $Id: hip_55.c,v 1.8 2011/01/13 04:59:26 tbox Exp $ */
 
 /* reviewed: TBC */
 

diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index 4e21e2b558f9cecaf5ad6a87421daf4525a1e579..838641a97a5d9560b1f2a582022db0fc76c4eb7a 100644 (file)
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 2009, 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipseckey_45.c,v 1.10 2011/01/13 00:55:49 marka Exp $ */
+/* $Id: ipseckey_45.c,v 1.11 2011/01/13 04:59:26 tbox Exp $ */
 
 #ifndef RDATA_GENERIC_IPSECKEY_45_C
 #define RDATA_GENERIC_IPSECKEY_45_C

diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c
index 45436f0c16188167732db712627a0a4e5b89091d..095f42eba899dadefd830215b446ffbda872066b 100644 (file)
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec_47.c,v 1.14 2011/01/13 00:55:49 marka Exp $ */
+/* $Id: nsec_47.c,v 1.15 2011/01/13 04:59:26 tbox Exp $ */
 
 /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index d43ae3a957cb8794afd5336900f151b0a6fdabc1..fcfd17e4a489034fe1b9bb702037ad39f5aa6388 100644 (file)
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rrsig_46.c,v 1.13 2011/01/13 00:55:49 marka Exp $ */
+/* $Id: rrsig_46.c,v 1.14 2011/01/13 04:59:26 tbox Exp $ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 

diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index 7259bb08bd05b2486e7372375e15cd16af1210c2..03e1a02689cd913d40915b6b36a62e9f3e4c389f 100644 (file)
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rpz.c,v 1.4 2011/01/13 04:20:03 marka Exp $ */
+/* $Id: rpz.c,v 1.5 2011/01/13 04:59:25 tbox Exp $ */
 
 /*! \file */
 
@@ -389,7 +389,7 @@ new_node(dns_rpz_cidr_t *cidr, const dns_rpz_cidr_key_t *ip,
        memset(node, 0, sizeof(*node));
 
        node->flags = flags & ~(DNS_RPZ_CIDR_FG_IP_DATA |
-                               DNS_RPZ_CIDR_FG_NSIP_DATA);
+                               DNS_RPZ_CIDR_FG_NSIP_DATA);
 
        node->bits = bits;
        words = bits / DNS_RPZ_CIDR_WORD_BITS;
@@ -1082,7 +1082,7 @@ dns_rpz_cidr_deleteip(dns_rpz_cidr_t *cidr, dns_name_t *name) {
  */
 isc_result_t
 dns_rpz_cidr_find(dns_rpz_cidr_t *cidr, const isc_netaddr_t *netaddr,
-                 dns_rpz_type_t type, dns_name_t *canon_name,
+                 dns_rpz_type_t type, dns_name_t *canon_name,
                  dns_name_t *search_name, dns_rpz_cidr_bits_t *prefix)
 {
        dns_rpz_cidr_key_t tgt_ip;

diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index fff0337727250b14d1001cec14c9f322b5bfeff0..a8adbbfb03053c625c387f812744eb01aada769b 100644 (file)
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.c,v 1.75 2011/01/13 01:59:27 marka Exp $ */
+/* $Id: sdb.c,v 1.76 2011/01/13 04:59:25 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index a464a56b6dc9a1826dc53e0e760b64888761b954..992725718039cd625c8fbad4b5f341c0e8caf4c2 100644 (file)
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2005-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2005-2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.c,v 1.29 2011/01/13 01:59:28 marka Exp $ */
+/* $Id: sdlz.c,v 1.30 2011/01/13 04:59:25 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index fc0305876c04446306114a8f894b6cae56278cc1..176961bebab19d938a9d6bc1ad4ff0aea402a969 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.581 2011/01/13 01:59:28 marka Exp $ */
+/* $Id: zone.c,v 1.582 2011/01/13 04:59:25 tbox Exp $ */
 
 /*! \file */