update copyright notice

diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index 140e56699e20cb6f5326d5b4e11cf4c5df469a15..2136a63a7588ff4efb8ff2c48913ba33b0dca765 100644 (file)
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-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: check-tool.c,v 1.10.18.19 2008/10/24 00:38:02 marka Exp $ */
+/* $Id: check-tool.c,v 1.10.18.20 2008/10/24 01:43:17 tbox Exp $ */
 
 /*! \file */
 
@@ -67,7 +67,7 @@
                result = (r); \
                if (result != ISC_R_SUCCESS) \
                        goto cleanup; \
-       } while (0)   
+       } while (0)
 
 static const char *dbtype[] = { "rbt" };
 
@@ -82,7 +82,7 @@ isc_boolean_t docheckmx = ISC_FALSE;
 isc_boolean_t dochecksrv = ISC_FALSE;
 isc_boolean_t docheckns = ISC_FALSE;
 #endif
-unsigned int zone_options = DNS_ZONEOPT_CHECKNS | 
+unsigned int zone_options = DNS_ZONEOPT_CHECKNS |
                            DNS_ZONEOPT_CHECKMX |
                            DNS_ZONEOPT_MANYERRORS |
                            DNS_ZONEOPT_CHECKNAMES |
@@ -142,7 +142,7 @@ checkns(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner,
        if (dns_name_countlabels(name) > 1U)
                strcat(namebuf, ".");
        dns_name_format(owner, ownerbuf, sizeof(ownerbuf));
-       
+
        result = getaddrinfo(namebuf, NULL, &hints, &ai);
        dns_name_format(name, namebuf, sizeof(namebuf) - 1);
        switch (result) {
@@ -314,7 +314,7 @@ checkmx(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
        if (dns_name_countlabels(name) > 1U)
                strcat(namebuf, ".");
        dns_name_format(owner, ownerbuf, sizeof(ownerbuf));
-       
+
        result = getaddrinfo(namebuf, NULL, &hints, &ai);
        dns_name_format(name, namebuf, sizeof(namebuf) - 1);
        switch (result) {
@@ -387,7 +387,7 @@ checksrv(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) {
        if (dns_name_countlabels(name) > 1U)
                strcat(namebuf, ".");
        dns_name_format(owner, ownerbuf, sizeof(ownerbuf));
-       
+
        result = getaddrinfo(namebuf, NULL, &hints, &ai);
        dns_name_format(name, namebuf, sizeof(namebuf) - 1);
        switch (result) {

diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index 8eb3bcaa5a115155ad1aabfa16728f0bcef20c15..f16053bcbb11aef93c64558ec4030a79c86a1302 100644 (file)
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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: named-checkzone.c,v 1.29.18.20 2008/10/24 00:57:38 marka Exp $ */
+/* $Id: named-checkzone.c,v 1.29.18.21 2008/10/24 01:43:17 tbox Exp $ */
 
 /*! \file */
 
@@ -228,7 +228,7 @@ main(int argc, char **argv) {
                                zone_options &= ~DNS_ZONEOPT_FATALNS;
                        } else if (ARGCMP("fail")) {
                                zone_options |= DNS_ZONEOPT_CHECKNS|
-                                               DNS_ZONEOPT_FATALNS;
+                                               DNS_ZONEOPT_FATALNS;
                        } else {
                                fprintf(stderr, "invalid argument to -n: %s\n",
                                        isc_commandline_argument);

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 7722588bcc257e6c26cebf45612e796b151ab99c..9c86afd46d5f3ad68092e1ad38f1a9daa5404c24 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * 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.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: globals.h,v 1.64.18.5 2008/10/24 01:14:35 marka Exp $ */
+/* $Id: globals.h,v 1.64.18.6 2008/10/24 01:43:17 tbox Exp $ */
 
 #ifndef NAMED_GLOBALS_H
 #define NAMED_GLOBALS_H 1

diff --git a/bin/named/unix/include/named/os.h b/bin/named/unix/include/named/os.h
index b973f6a4201f34442786da066850bb5d6d6d5b0a..6c603dcc2a22d76d7d415758ae814b6e2d29e83d 100644 (file)
--- a/bin/named/unix/include/named/os.h
+++ b/bin/named/unix/include/named/os.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * 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.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.22.18.4 2008/10/24 01:28:08 marka Exp $ */
+/* $Id: os.h,v 1.22.18.5 2008/10/24 01:43:17 tbox Exp $ */
 
 #ifndef NS_OS_H
 #define NS_OS_H 1

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index f543beac10b3dbc204b3785a6d58d8d7ffb039bc..ad26a8e9b0e9d1f8565b9795d54bcbbb5ef824c6 100644 (file)
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.66.18.16 2008/10/24 01:28:08 marka Exp $ */
+/* $Id: os.c,v 1.66.18.17 2008/10/24 01:43:17 tbox Exp $ */
 
 /*! \file */
 
@@ -549,7 +549,7 @@ ns_os_adjustnofile() {
        result = isc_resource_setlimit(isc_resource_openfiles, newvalue);
        if (result != ISC_R_SUCCESS)
                ns_main_earlywarning("couldn't adjust limit on open files");
-#endif 
+#endif
 }
 
 void

diff --git a/bin/named/win32/include/named/os.h b/bin/named/win32/include/named/os.h
index ea967e4ab6a69956b7fd0a7194c6342f255f368f..c070abac328fb6bc34b64bf308007545e9a46aa4 100644 (file)
--- a/bin/named/win32/include/named/os.h
+++ b/bin/named/win32/include/named/os.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * 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.
  *
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.9.18.2 2008/10/24 01:28:08 marka Exp $ */
+/* $Id: os.h,v 1.9.18.3 2008/10/24 01:43:17 tbox Exp $ */
 
 #ifndef NS_OS_H
 #define NS_OS_H 1

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 420b8cc5c5bfc195da4c9d90a67ce7e90d470a27..36f303c375f85df5e0f2c549c3a4007960cfd94e 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  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.410.18.54 2008/10/24 00:38:01 marka Exp $ */
+/* $Id: zone.c,v 1.410.18.55 2008/10/24 01:43:17 tbox Exp $ */
 
 /*! \file */
 
@@ -813,10 +813,10 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) {
        isc_result_t result = ISC_R_SUCCESS;
        void *mem;
        char **tmp, *tmp2;
-       
+
        REQUIRE(DNS_ZONE_VALID(zone));
        REQUIRE(argv != NULL && *argv == NULL);
-       
+
        LOCK_ZONE(zone);
        size = (zone->db_argc + 1) * sizeof(char *);
        for (i = 0; i < zone->db_argc; i++)
@@ -927,7 +927,7 @@ void
 dns_zone_setacache(dns_zone_t *zone, dns_acache_t *acache) {
        REQUIRE(DNS_ZONE_VALID(zone));
        REQUIRE(acache != NULL);
-       
+
        LOCK_ZONE(zone);
        if (zone->acache != NULL)
                dns_acache_detach(&zone->acache);
@@ -1425,7 +1425,7 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
        dns_fixedname_t fixed;
        dns_name_t *foundname;
        int level;
-       
+
        /*
         * Outside of zone.
         */
@@ -1507,7 +1507,7 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
        dns_fixedname_t fixed;
        dns_name_t *foundname;
        int level;
-       
+
        /*
         * "." means the services does not exist.
         */
@@ -1598,7 +1598,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
        dns_rdataset_t a;
        dns_rdataset_t aaaa;
        int level;
-       
+
        /*
         * Outside of zone.
         */
@@ -1636,7 +1636,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
                if (tresult == ISC_R_SUCCESS) {
                        dns_rdataset_disassociate(&aaaa);
                        return (ISC_TRUE);
-               } 
+               }
                if (tresult == DNS_R_DELEGATION)
                        dns_rdataset_disassociate(&aaaa);
                if (result == DNS_R_GLUE || tresult == DNS_R_GLUE) {
@@ -1751,7 +1751,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
                if (dns_name_equal(name, &zone->origin))
                        goto checkmx;
 
-               result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_ns, 
+               result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_ns,
                                             0, 0, &rdataset, NULL);
                if (result != ISC_R_SUCCESS)
                        goto checkmx;
@@ -1773,7 +1773,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
                dns_rdataset_disassociate(&rdataset);
 
  checkmx:
-               result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_mx, 
+               result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_mx,
                                             0, 0, &rdataset, NULL);
                if (result != ISC_R_SUCCESS)
                        goto checksrv;
@@ -1792,7 +1792,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
  checksrv:
                if (zone->rdclass != dns_rdataclass_in)
                        goto next;
-               result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_srv, 
+               result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_srv,
                                             0, 0, &rdataset, NULL);
                if (result != ISC_R_SUCCESS)
                        goto next;
@@ -1850,12 +1850,12 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) {
 
        for (result = dns_rdataset_first(&rdataset);
             result == ISC_R_SUCCESS;
-            result = dns_rdataset_next(&rdataset)) 
+            result = dns_rdataset_next(&rdataset))
        {
                dns_rdataset_current(&rdataset, &rdata);
                result = dns_rdata_tostruct(&rdata, &dnskey, NULL);
                INSIST(result == ISC_R_SUCCESS);
-               
+
                if ((dnskey.algorithm == DST_ALG_RSASHA1 ||
                     dnskey.algorithm == DST_ALG_RSAMD5) &&
                     dnskey.datalen > 1 && dnskey.data[0] == 1 &&
@@ -1887,7 +1887,7 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) {
                dns_db_detachnode(db, &node);
        if (version != NULL)
                dns_db_closeversion(db, &version, ISC_FALSE);
-       
+
 }
 
 static isc_result_t
@@ -2041,7 +2041,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
                        } else if (!isc_serial_ge(serial, zone->serial))
                                dns_zone_log(zone, ISC_LOG_ERROR,
                                             "zone serial has gone backwards");
-                       else if (serial == zone->serial && !hasinclude) 
+                       else if (serial == zone->serial && !hasinclude)
                                dns_zone_log(zone, ISC_LOG_ERROR,
                                             "zone serial unchanged. "
                                             "zone may fail to transfer "
@@ -2173,7 +2173,7 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_name_t *name) {
        dns_fixedname_t fixed;
        dns_name_t *foundname;
        int level;
-       
+
        if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_NOCHECKNS))
                return (ISC_TRUE);
 
@@ -2762,7 +2762,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone,
        }
 
        LOCK_ZONE(zone);
-       /* 
+       /*
         * The refresh code assumes that 'masters' wouldn't change under it.
         * If it will change then kill off any current refresh in progress
         * and update the masters info.  If it won't change then we can just
@@ -2817,7 +2817,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone,
                goto unlock;
        }
        memcpy(new, masters, count * sizeof(*new));
-       
+
        /*
         * Similarly for mastersok.
         */
@@ -4836,7 +4836,7 @@ add_opt(dns_message_t *message, isc_uint16_t udpsize) {
        if (result != ISC_R_SUCCESS)
                goto cleanup;
        dns_rdataset_init(rdataset);
-       
+
        rdatalist->type = dns_rdatatype_opt;
        rdatalist->covers = 0;
 
@@ -4873,7 +4873,7 @@ add_opt(dns_message_t *message, isc_uint16_t udpsize) {
                dns_message_puttemprdataset(message, &rdataset);
        if (rdata != NULL)
                dns_message_puttemprdata(message, &rdata);
-       
+
        return (result);
 }
 
@@ -5163,7 +5163,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
                }
        }
        if (key == NULL)
-               (void)dns_view_getpeertsig(zone->view, &masterip, &key);        
+               (void)dns_view_getpeertsig(zone->view, &masterip, &key);
 
        if (zone->view->peers != NULL) {
                dns_peer_t *peer = NULL;
@@ -5183,7 +5183,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
                                  dns_resolver_getudpsize(zone->view->resolver);
                        (void)dns_peer_getudpsize(peer, &udpsize);
                }
-               
+
        }
        if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS)) {
                result = add_opt(message, udpsize);
@@ -5317,7 +5317,7 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
                if (zone->writeio != NULL)
                        zonemgr_cancelio(zone->writeio);
 
-               if (zone->dctx != NULL) 
+               if (zone->dctx != NULL)
                        dns_dumpctx_cancel(zone->dctx);
        }
 
@@ -6666,7 +6666,7 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
                }
                DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDCOMPACT);
        }
-       
+
        /*
         * This transfer finishing freed up a transfer quota slot.
         * Let any other zones waiting for quota have it.
@@ -6704,7 +6704,7 @@ zone_loaddone(void *arg, isc_result_t result) {
        ENTER;
 
        tresult = dns_db_endload(load->db, &load->callbacks.add_private);
-       if (tresult != ISC_R_SUCCESS && 
+       if (tresult != ISC_R_SUCCESS &&
            (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE))
                result = tresult;