update copyright notice

diff --git a/bin/tests/system/geoip/ns2/named10.conf b/bin/tests/system/geoip/ns2/named10.conf
index 29d9d434590affd82e74c0959348e0963c28bba0..3594f615ab98d7f0c0647a1f76c0e021ce6f606f 100644 (file)
--- a/bin/tests/system/geoip/ns2/named10.conf
+++ b/bin/tests/system/geoip/ns2/named10.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014  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

diff --git a/bin/tests/system/geoip/ns2/named14.conf b/bin/tests/system/geoip/ns2/named14.conf
index bce55dc0ef816c30990e2f2e87150304524a5b8f..10c6d9becb5c6460534dc1579210a211dc715500 100644 (file)
--- a/bin/tests/system/geoip/ns2/named14.conf
+++ b/bin/tests/system/geoip/ns2/named14.conf
@@ -28,7 +28,7 @@ options {
        listen-on-v6 { none; };
        recursion no;
        geoip-directory "../data";
-        geoip-use-ecs no;
+       geoip-use-ecs no;
 };
 
 key rndc_key {

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 38c1b244ed4bbf04f5cefcb8301883b45a9d8216..e1081a5647e412bb61b7054108475dec4fd1de1f 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1201,16 +1201,16 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
        }
 
 #ifdef ISC_PLATFORM_USESIT
-        obj = NULL;
-        (void) cfg_map_get(options, "sit-secret", &obj);
-        if (obj != NULL) {
-                isc_buffer_t b;
+       obj = NULL;
+       (void) cfg_map_get(options, "sit-secret", &obj);
+       if (obj != NULL) {
+               isc_buffer_t b;
                unsigned char secret[32];
 
-                memset(secret, 0, sizeof(secret));
-                isc_buffer_init(&b, secret, sizeof(secret));
-                tresult = isc_hex_decodestring(cfg_obj_asstring(obj), &b);
-               if (tresult == ISC_R_NOSPACE) { 
+               memset(secret, 0, sizeof(secret));
+               isc_buffer_init(&b, secret, sizeof(secret));
+               tresult = isc_hex_decodestring(cfg_obj_asstring(obj), &b);
+               if (tresult == ISC_R_NOSPACE) {
                        cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
                                    "sit-secret: too long");
                } else if (tresult != ISC_R_SUCCESS) {
@@ -1220,15 +1220,15 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
                if (tresult != ISC_R_SUCCESS)
                        result = tresult;
 #ifdef AES_SIT
-                if (tresult == ISC_R_SUCCESS &&
+               if (tresult == ISC_R_SUCCESS &&
                    isc_buffer_usedlength(&b) != ISC_AES128_KEYLENGTH) {
                        cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
-                                    "AES sit-secret must be on 128 bits");
+                                   "AES sit-secret must be on 128 bits");
                        result = ISC_R_RANGE;
                }
 #endif
 #ifdef HMAC_SHA1_SIT
-                if (tresult == ISC_R_SUCCESS &&
+               if (tresult == ISC_R_SUCCESS &&
                    isc_buffer_usedlength(&b) != ISC_SHA1_DIGESTLENGTH) {
                        cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
                                    "SHA1 sit-secret must be on 160 bits");
@@ -1236,14 +1236,14 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
                }
 #endif
 #ifdef HMAC_SHA256_SIT
-                if (tresult == ISC_R_SUCCESS &&
+               if (tresult == ISC_R_SUCCESS &&
                    isc_buffer_usedlength(&b) != ISC_SHA256_DIGESTLENGTH) {
                        cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
-                                    "SHA256 sit-secret must be on 256 bits");
+                                   "SHA256 sit-secret must be on 256 bits");
                        result = ISC_R_RANGE;
                }
 #endif
-        }
+       }
 #endif
 
        return (result);

diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index 11efa50e356ecd48aed1f46b8170c3c4be129b87..41c865585a498134920a876d7c1176229014e99e 100644 (file)
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -199,7 +199,7 @@ dns_acl_match(const isc_netaddr_t *reqaddr,
 isc_result_t
 dns_acl_match2(const isc_netaddr_t *reqaddr,
               const dns_name_t *reqsigner,
-              const isc_netaddr_t *ecs, 
+              const isc_netaddr_t *ecs,
               isc_uint8_t ecslen,
               isc_uint8_t *scope,
               const dns_acl_t *acl,
@@ -444,7 +444,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr,
 isc_boolean_t
 dns_aclelement_match2(const isc_netaddr_t *reqaddr,
                      const dns_name_t *reqsigner,
-                     const isc_netaddr_t *ecs, 
+                     const isc_netaddr_t *ecs,
                      isc_uint8_t ecslen,
                      isc_uint8_t *scope,
                      const dns_aclelement_t *e,

diff --git a/lib/dns/geoip.c b/lib/dns/geoip.c
index e375e3381938c0ca413952e93b016ab8e745de69..42109fedcbf9048050938cb102334c7955e63c72 100644 (file)
--- a/lib/dns/geoip.c
+++ b/lib/dns/geoip.c
@@ -259,7 +259,7 @@ country_lookup(GeoIP *db, dns_geoip_subtype_t subtype,
              memcmp(prev_state->ipnum6.s6_addr, ipnum6->s6_addr, 16) == 0)))
        {
                text = prev_state->text;
-               if (scope != NULL) 
+               if (scope != NULL)
                        *scope = prev_state->scope;
        }
 
@@ -418,7 +418,7 @@ city_lookup(GeoIP *db, dns_geoip_subtype_t subtype,
              memcmp(prev_state->ipnum6.s6_addr, ipnum6->s6_addr, 16) == 0)))
        {
                record = prev_state->record;
-               if (scope != NULL) 
+               if (scope != NULL)
                        *scope = record->netmask;
        }
 
@@ -499,7 +499,7 @@ region_lookup(GeoIP *db, dns_geoip_subtype_t subtype,
            is_region(prev_state->subtype))
        {
                region = prev_state->region;
-               if (scope != NULL) 
+               if (scope != NULL)
                        *scope = prev_state->scope;
        }
 
@@ -539,7 +539,7 @@ name_lookup(GeoIP *db, dns_geoip_subtype_t subtype,
            prev_state->subtype == subtype)
        {
                name = prev_state->name;
-               if (scope != NULL) 
+               if (scope != NULL)
                        *scope = prev_state->scope;
        }
 
@@ -579,7 +579,7 @@ netspeed_lookup(GeoIP *db, dns_geoip_subtype_t subtype,
        if (prev_state != NULL && prev_state->ipnum == ipnum &&
            prev_state->subtype == subtype) {
                id = prev_state->id;
-               if (scope != NULL) 
+               if (scope != NULL)
                        *scope = prev_state->scope;
                found = ISC_TRUE;
        }

diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h
index d44af1ec7d4dcf3a6c224d7679be57c6a036b8fa..b2860e55bd86ad0aad56f19dc7e28f279506ab89 100644 (file)
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -217,7 +217,7 @@ dns_acl_match(const isc_netaddr_t *reqaddr,
 isc_result_t
 dns_acl_match2(const isc_netaddr_t *reqaddr,
               const dns_name_t *reqsigner,
-              const isc_netaddr_t *ecs, 
+              const isc_netaddr_t *ecs,
               isc_uint8_t ecslen,
               isc_uint8_t *scope,
               const dns_acl_t *acl,
@@ -265,7 +265,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr,
 isc_boolean_t
 dns_aclelement_match2(const isc_netaddr_t *reqaddr,
                      const dns_name_t *reqsigner,
-                     const isc_netaddr_t *ecs, 
+                     const isc_netaddr_t *ecs,
                      isc_uint8_t ecslen,
                      isc_uint8_t *scope,
                      const dns_aclelement_t *e,

diff --git a/lib/isc/radix.c b/lib/isc/radix.c
index ebe277048eb0c23c08141a50057fda811878515e..47e13b7856667e99fecc5049207187f1fadbc217 100644 (file)
--- a/lib/isc/radix.c
+++ b/lib/isc/radix.c
@@ -361,7 +361,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target,
                        int next = ++radix->num_added_node;
                        if (fam == AF_UNSPEC) {
                                /* "any" or "none" */
-                               for (i = 0; i < 4; i++) 
+                               for (i = 0; i < 4; i++)
                                        node->node_num[i] = next;
                        } else {
                                node->node_num[ISC_RADIX_OFF(prefix)] = next;
@@ -484,7 +484,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target,
                        int next = ++radix->num_added_node;
                        if (fam == AF_UNSPEC) {
                                /* "any" or "none" */
-                               for (i = 0; i < 4; i++) 
+                               for (i = 0; i < 4; i++)
                                        node->node_num[i] = next;
                        } else {
                                node->node_num[ISC_RADIX_OFF(prefix)] = next;
@@ -535,7 +535,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target,
                int next = ++radix->num_added_node;
                if (fam == AF_UNSPEC) {
                        /* "any" or "none" */
-                       for (i = 0; i < 4; i++) 
+                       for (i = 0; i < 4; i++)
                                new_node->node_num[i] = next;
                } else {
                        new_node->node_num[ISC_RADIX_OFF(prefix)] = next;