Docs changes for ra-names.

diff --git a/CHANGELOG b/CHANGELOG
index 701a34e5485e840e9d667e9d544274c31e63034a..4174101514a1786be9cb5d0535ca40033bb4487e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,9 @@ version 2.61
            and allows us to find the prefix length for IPv6
            addresses.
 
+           Add ra-names DHCPv6 keyword which adds AAAA records
+           for dual-stack hosts which get IPv6 addresses via SLAAC.
+
 
 version 2.60
             Fix compilation problem in Mac OS X Lion. Thanks to Olaf

diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example
index 43d8d01a07b22ae4469642f360a9fc85a127adb7..e08442e20a872aa31824a1054fe6bb243a101562 100644 (file)
--- a/dnsmasq.conf.example
+++ b/dnsmasq.conf.example
@@ -164,6 +164,15 @@
 # Do Router Advertisements, BUT NOT DHCP for this subnet.
 #dhcp-range=1234::, ra-only 
 
+# Do Router Advertisements, BUT NOT DHCP for this subnet, also try and
+# add names to the DNS for the IPv6 address of SLAAC-configured dual-stack 
+# hosts. Use the DHCPv4 lease to derive the name, network segment and 
+# MAC address and assume that the host will also have an
+# IPv6 address calculated using the SLAAC alogrithm.
+# This will generate an erroneous AAAA record if a host is using privacy 
+# extensions or does not support IPv6. Use with care.
+#dhcp-range=1234::, ra-names
+
 # Do Router Advertisements, BUT NOT DHCP for this subnet.
 # Set the lifetime to 46 hours. (Note: minimum lifetime is 2 hours.)
 #dhcp-range=1234::, ra-only, 48h

diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
index f725701cdc2d1f6ba8dbb7270d33894cdff936ea..3fd8c00a1464aba41b0857c1864913f5fb86a03b 100644 (file)
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -556,7 +556,18 @@ the keyword
 which tells dnsmasq to offer Router Advertisement only on this subnet,
 and not DHCP. This applies to IPv6 only, see
 .B enable-ra
-for details.
+for details. Instead, the keyword
+.B ra-names
+may be used. This does the same at ra-only, but also enables a mode
+which gives DNS names to dual-stack hosts which do SLAAC for
+IPv6. Dnsmasq uses the hosts IPv4 lease to derive the name, network
+segment and MAC address and assumes that the host will also have an
+IPv6 address calculated using the SLAAC alogrithm, on the same network
+segment. An AAAA record is added to the DNS for this IPv6
+address. Note that this is only happens for directly-connected
+networks, (not one doing DHCP via a relay) and it will generate an
+erroneous AAAA record if a host is using privacy extensions or does
+not support IPv6. Use with care.
 
 The interface:<interface name> section is not normally used. See the
 NOTES section for details of this.