Fix documentation to adhere to RFC 5952

Update the text representations of IPv6 addresses.

diff --git a/doc/README.DNS64 b/doc/README.DNS64
index 71e2310ed9aaf8f80371130f54eee42f95f101c5..2f2484434dfd52d12292817da078a37b6903002a 100644 (file)
--- a/doc/README.DNS64
+++ b/doc/README.DNS64
@@ -13,7 +13,7 @@ If you're not using DNSSEC then you may remove "validator".
 
 2. The "dns64-prefix" directive indicates your DNS64 prefix. For example:
 
-    dns64-prefix: 64:FF9B::/96
+    dns64-prefix: 64:ff9b::/96
 
 The prefix must be a /96 or shorter.
 
@@ -42,9 +42,9 @@ To enable NAT64 in Unbound, add to unbound.conf's "server" section:
     do-nat64: yes
 
 The NAT64 prefix defaults to the DNS64 prefix, which in turn defaults to the
-standard 64:FF9B::/96 prefix.  You can reconfigure it with:
+standard 64:ff9b::/96 prefix.  You can reconfigure it with:
 
-    nat64-prefix: 64:FF9B::/96
+    nat64-prefix: 64:ff9b::/96
 
 To test NAT64 operation, pick a domain that only has IPv4 reachability for its
 nameservers and try resolving any names in that domain.

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 296dabbd291ccf69050b7c6b035e8085c9aeb630..b31a2613454784ef8f3b3f3cb4affebf05f4c646 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -54,7 +54,7 @@ server:
        # interface: 192.0.2.153
        # interface: 192.0.2.154
        # interface: 192.0.2.154@5003
-       # interface: 2001:DB8::5
+       # interface: 2001:db8::5
        # interface: eth0@5003
 
        # enable this feature to copy the source address of queries to reply.
@@ -72,12 +72,12 @@ server:
        # server from by ip-address. If none, the default (all) interface
        # is used. Specify every interface on a 'outgoing-interface:' line.
        # outgoing-interface: 192.0.2.153
-       # outgoing-interface: 2001:DB8::5
-       # outgoing-interface: 2001:DB8::6
+       # outgoing-interface: 2001:db8::5
+       # outgoing-interface: 2001:db8::6
 
        # Specify a netblock to use remainder 64 bits as random bits for
        # upstream queries.  Uses freebind option (Linux).
-       # outgoing-interface: 2001:DB8::/64
+       # outgoing-interface: 2001:db8::/64
        # Also (Linux:) ip -6 addr add 2001:db8::/64 dev lo
        # And: ip -6 route add local 2001:db8::/64 dev lo
        # And set prefer-ip6: yes to use the ip6 randomness from a netblock.
@@ -379,7 +379,7 @@ server:
        # interface-action: 192.0.2.153 allow
        # interface-action: 192.0.2.154 allow
        # interface-action: 192.0.2.154@5003 allow
-       # interface-action: 2001:DB8::5 allow
+       # interface-action: 2001:db8::5 allow
        # interface-action: eth0@5003 allow
 
        # Similar to 'access-control-tag:' but for interfaces.

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index d87b96c226f4539b3380217d070cb3c7dfb14243..cc8559fe0b88e4dd934d3819aa8890da14541e5a 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -102,7 +102,7 @@ server:
     interface: 0.0.0.0
     interface: ::0
     access\-control: 10.0.0.0/8 allow
-    access\-control: 2001:DB8::/64 allow
+    access\-control: 2001:db8::/64 allow
 .ft P
 .fi
 .UNINDENT
@@ -3377,7 +3377,7 @@ zone section below.
 Configure local data shorthand for a PTR record with the reversed IPv4 or
 IPv6 address and the host name.
 For example \fB\(dq192.0.2.4 www.example.com\(dq\fP\&.
-TTL can be inserted like this: \fB\(dq2001:DB8::4 7200 www.example.com\(dq\fP
+TTL can be inserted like this: \fB\(dq2001:db8::4 7200 www.example.com\(dq\fP
 .UNINDENT
 .INDENT 0.0
 .TP

diff --git a/doc/unbound.conf.rst b/doc/unbound.conf.rst
index da3a8b73c12952fc1fad42138dc03fdcc7163958..c6d840ee568b0c29c07c39b6194d7a3cdfb80652 100644 (file)
--- a/doc/unbound.conf.rst
+++ b/doc/unbound.conf.rst
@@ -102,7 +102,7 @@ all the options.
         interface: 0.0.0.0
         interface: ::0
         access-control: 10.0.0.0/8 allow
-        access-control: 2001:DB8::/64 allow
+        access-control: 2001:db8::/64 allow
 
 .. _unbound.conf.clauses:
 
@@ -2896,7 +2896,7 @@ These options are part of the ``server:`` section.
     Configure local data shorthand for a PTR record with the reversed IPv4 or
     IPv6 address and the host name.
     For example ``"192.0.2.4 www.example.com"``.
-    TTL can be inserted like this: ``"2001:DB8::4 7200 www.example.com"``
+    TTL can be inserted like this: ``"2001:db8::4 7200 www.example.com"``
 
 
 @@UAHL@unbound.conf@local-zone-tag@@: *<zone> <"list of tags">*

diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 07c016d7ba7431a3960716cfdd6fb9627faab037..79ce45f395598da3a0f3f7c683919b77ba8f20e7 100644 (file)
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -283,7 +283,7 @@ net_test(void)
                unit_assert(strcmp(astr, "1.2.3.0") == 0);
                unit_assert(ntohs(((struct sockaddr_in*)&a)->sin_port)==53);
 
-               res = netblockstrtoaddr("2001:DB8:33:44::/64", 53,
+               res = netblockstrtoaddr("2001:db8:33:44::/64", 53,
                        &a, &alen, &net);
                unit_assert(res!=0 && net == 64);
                addr_to_str(&a, alen, astr, sizeof(astr));

diff --git a/testdata/04-checkconf.tdir/good.all b/testdata/04-checkconf.tdir/good.all
index d564f983c5a006e09d6da52319067b2ae0d095bf..2f80db8a8b01e718c22d5071232f387f6879c65c 100644 (file)
--- a/testdata/04-checkconf.tdir/good.all
+++ b/testdata/04-checkconf.tdir/good.all
@@ -24,7 +24,7 @@ server:
        # specify every interface on a new 'interface:' labelled line.
        interface: 192.0.2.153
        interface: 192.0.2.154
-       interface: 2001:DB8::5
+       interface: 2001:db8::5
 
        # port to answer queries from
        port: 53

diff --git a/testdata/04-checkconf.tdir/good.ifport b/testdata/04-checkconf.tdir/good.ifport
index 1aa59d1b701f7070f80ad855406526db966311e4..aba268574e92254ddc87a20c1458f601e1304b56 100644 (file)
--- a/testdata/04-checkconf.tdir/good.ifport
+++ b/testdata/04-checkconf.tdir/good.ifport
@@ -11,7 +11,7 @@ server:
        # specify every interface on a new 'interface:' labelled line.
        interface: 192.0.2.153
        interface: 192.0.2.154
-       interface: 2001:DB8::5
+       interface: 2001:db8::5
        interface: 0.0.0.0@5353
 
        # config

diff --git a/testdata/test_ldnsrr.5 b/testdata/test_ldnsrr.5
index 1f2837a67098508d5c4cbc09d2a32bf3f463a501..c970d91771582817b24bc4217ae786c7548fd0bf 100644 (file)
--- a/testdata/test_ldnsrr.5
+++ b/testdata/test_ldnsrr.5
@@ -83,7 +83,7 @@ prev-nxt      IN      A       127.0.0.1
 
 host1.blaat.nl. IN NID 10 0014:4fff:ff20:ee64
 host1.blaat.nl. IN L32 10 10.1.2.0
-host1.blaat.nl. IN L64 10 2001:0DB8:1140:1000
+host1.blaat.nl. IN L64 10 2001:db8:1140:1000
 host1.blaat.nl. IN LP 10 l64-subnet1.blaat.nl.
 
 ;error1        IN      NID 1 00fg:4fff:ff20:ee64