- bug#329: in example.conf show correct ipv4 link-local 169.254/16.

git-svn-id: file:///svn/unbound/trunk@2244 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index fb754462e27bf71b84dd3f349c947b9157ebc383..e9e36da17556f694a3f524443eb3ad1c08291490 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+24 September 2010: Wouter
+       - bug#329: in example.conf show correct ipv4 link-local 169.254/16.
+
 23 September 2010: Wouter
        - unbound-anchor app, unbound requires libexpat (xml parser library).
 

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 1e3af95042ebc9e504f4da6fdb2cce06600fd711..e5cafbd6e1322a3846eccfa32e68690ea5fb035e 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -271,7 +271,7 @@ server:
        # private-address: 10.0.0.0/8
        # private-address: 172.16.0.0/12
        # private-address: 192.168.0.0/16
-       # private-address: 192.254.0.0/16
+       # private-address: 169.254.0.0/16
        # private-address: fd00::/8
        # private-address: fe80::/10
 

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 49eeb7cbe5a0e32883e737ac661fb229686ad857..671ce3daca23e5d524266084b34451f8633fcb17 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -488,7 +488,7 @@ that you configured is allowed to, and you can specify additional
 names using \fBprivate\-domain\fR.  No private addresses are enabled
 by default.  We consider to enable this for the RFC1918 private IP
 address space by default in later releases. That would enable private 
-addresses for 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 192.254.0.0/16 
+addresses for 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 169.254.0.0/16 
 fd00::/8 and fe80::/10, since the RFC standards say these addresses 
 should not be visible on the public internet.  Turning on 127.0.0.0/8 
 would hinder many spamblocklists as they use that.

diff --git a/testdata/iter_privaddr.rpl b/testdata/iter_privaddr.rpl
index 06517756241453bd292d08831dcac113db3b14b3..63fa5331bb2082dc0700e4f37dfeedbcbeda6b1e 100644 (file)
--- a/testdata/iter_privaddr.rpl
+++ b/testdata/iter_privaddr.rpl
@@ -5,7 +5,7 @@ server:
        private-address: 10.0.0.0/8
        private-address: 172.16.0.0/12
        private-address: 192.168.0.0/16
-       private-address: 192.254.0.0/16
+       private-address: 169.254.0.0/16
        private-address: fd00::/8
        private-address: fe80::/10