update copyright notice / whitespace

diff --git a/CHANGES b/CHANGES
index e60f837b5347b0d8ba5b4c3ac0af4a121654380c..544918834f78baa7b8273e6c12449e60fc512290 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,8 +10,8 @@
                        automatically by converted to NZD databases.
                        To view the contents of an NZD or to roll back to
                        NZF format, use "named-nzd2nzf". To disable
-                        this feature, use "configure --without-lmdb".
-                        [RT #39837]
+                       this feature, use "configure --without-lmdb".
+                       [RT #39837]
 
 4420.  [func]          nslookup now looks for AAAA as well as A by default.
                        [RT #40420]

diff --git a/bin/named/server.c b/bin/named/server.c
index 3d6f367a469ae6a2a5d31dfee9ca5c8c419165a5..3363db2af5cea8633e028b390e198e54582af1c9 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -10597,7 +10597,7 @@ nzd_setkey(MDB_val *key, dns_name_t *name, char *namebuf, size_t buflen) {
        dns_fixedname_init(&fixed);
        dns_name_downcase(name, dns_fixedname_name(&fixed), NULL);
        dns_name_format(dns_fixedname_name(&fixed), namebuf, buflen);
-       
+
        key->mv_data = namebuf;
        key->mv_size = strlen(namebuf);
 }
@@ -10920,7 +10920,7 @@ migrate_nzf(dns_view_t *view) {
         */
        strlcpy(tempname, view->new_zone_file, sizeof(tempname));
        if (strlen(tempname) < sizeof(tempname) - 1) {
-               strcat(tempname, "~");
+               strcat(tempname, "~");
                isc_file_rename(view->new_zone_file, tempname);
        }
 
@@ -11585,12 +11585,12 @@ rmzone(isc_task_t *task, isc_event_t *event) {
                        const cfg_obj_t *voptions =
                                cfg_tuple_get(cfg->vconfig, "options");
                        result = delete_zoneconf(view, cfg->conf_parser,
-                                                voptions,
+                                                voptions,
                                                 dns_zone_getorigin(zone),
                                                 NULL);
                } else {
                        result = delete_zoneconf(view, cfg->conf_parser,
-                                                cfg->config,
+                                                cfg->config,
                                                 dns_zone_getorigin(zone),
                                                 NULL);
                }

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 700070f959f2f9a24c0b4c5cb39017cfd393e072..760581593ae7e049878ed517685c7a6895aeee32 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -485,7 +485,7 @@
          in a database, rather than in a flat "NZF" file.  This
          dramatically improves performance for
          <command>rndc delzone</command> and
-         <command>rndc modzone</command>: deleting or changing 
+         <command>rndc modzone</command>: deleting or changing
          the contents of a database is much faster than rewriting
          a text file.
        </para>

diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 08b666507cc7c555492c82f8754c40505eb4551f..29b487c0fed9f38245d978b8278193abe7a1cc4a 100644 (file)
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -872,7 +872,7 @@ catz_process_zones(dns_catz_zone_t *zone, dns_rdataset_t *value,
        REQUIRE(name != NULL);
 
        if (value->rdclass != dns_rdataclass_in)
-               return (ISC_R_FAILURE);
+               return (ISC_R_FAILURE);
 
        if (name->labels == 0)
                return (ISC_R_FAILURE);