summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Kelley <simon@thekelleys.org.uk>2012-03-09 12:05:49 +0000
committerSimon Kelley <simon@thekelleys.org.uk>2012-03-09 12:05:49 +0000
commit7023e38294cfcc663aca7fbf730641deed878681 (patch)
treea34c03e8f54066a1475fbe1754e55fc5a4e2b5e8
parenta7cf58cc47a904889fd858a7bb022503f7507520 (diff)
downloaddnsmasq-7023e38294cfcc663aca7fbf730641deed878681.tar.gz
Docs changes for ra-names.
-rw-r--r--CHANGELOG3
-rw-r--r--dnsmasq.conf.example9
-rw-r--r--man/dnsmasq.813
3 files changed, 24 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 701a34e..4174101 100644
--- 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 43d8d01..e08442e 100644
--- 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 f725701..3fd8c00 100644
--- 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.