about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--posix/gai.conf20
2 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 223bf571c3..3167aacb65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-19  Ulrich Drepper  <drepper@redhat.com>
 
+	* posix/gai.conf: Update for current default tables.
+
+2007-11-19  Ulrich Drepper  <drepper@redhat.com>
+
 	* po/tr.po: Update from translation team.
 
 2007-11-18  Roland McGrath  <roland@frob.com>
diff --git a/posix/gai.conf b/posix/gai.conf
index 0e334ac2c5..fe5774b026 100644
--- a/posix/gai.conf
+++ b/posix/gai.conf
@@ -19,13 +19,14 @@
 #    Add another rule to the RFC 3484 label table.  See section 2.1 in
 #    RFC 3484.  The default is:
 #
-#label  ::1/128       0
-#label  ::/0          1
-#label  2002::/16     2
-#label ::/96          3
-#label ::ffff:0:0/96  4
-#label  fec0::/10     5
-#label  fc00::/7      6
+#label ::1/128       0
+#label ::/0          1
+#label 2002::/16     2
+#label ::/96         3
+#label ::ffff:0:0/96 4
+#label fec0::/10     5
+#label fc00::/7      6
+#label 2001:0::/32   7
 #
 #    This default differs from the tables given in RFC 3484 by handling
 #    (now obsolete) site-local IPv6 addresses and Unique Local Addresses.
@@ -35,10 +36,11 @@
 #    site-local IPv4 and IPv6 addresses a lookup for a global address would
 #    see the IPv6 be preferred.  The result is a long delay because the
 #    site-local IPv6 addresses cannot be used while the IPv4 address is
-#    (at least for the foreseeable future) NATed.
+#    (at least for the foreseeable future) NATed.  We also treat Teredo
+#    tunnels special.
 #
 # precedence  <mask>   <value>
-#    Add another rule the to RFC 3484 precedence table.  See section 2.1
+#    Add another rule to the RFC 3484 precedence table.  See section 2.1
 #    and 10.3 in RFC 3484.  The default is:
 #
 #precedence  ::1/128       50