From: Roy Marples <roy@marples.name>
Date: Thu, 5 Jun 2014 20:23:19 +0000 (+0000)
Subject: Default to private stable addresses via dhcpcd.conf instead of the binary
X-Git-Tag: v6.4.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ed5de79af085d7d128f716c10fceb9b623a40c;p=thirdparty%2Fdhcpcd.git

Default to private stable addresses via dhcpcd.conf instead of the binary
so that upgraders aren't adversely affected.
---

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index de2a827b..ea332dd1 100644
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -109,10 +109,7 @@ is also an implementation of the BOOTP client specified in
 is also an implementation of the IPv6 Router Solicitor as specified in
 .%R RFC 4861
 and
-.%R RFC 6106
-and will generate stable private Interface Identifiers for SLAAC
-as specified in
-.%R RFC 7212 .
+.%R RFC 6106 .
 .Pp
 .Nm
 is also an implemenation of the DHCPv6 client as specified in
diff --git a/dhcpcd.conf b/dhcpcd.conf
index 96eaf523..2ecbe742 100644
--- a/dhcpcd.conf
+++ b/dhcpcd.conf
@@ -30,6 +30,9 @@ option ntp_servers
 # A ServerID is required by RFC2131.
 require dhcp_server_identifier
 
+# Generate Stable Private IPv6 Addresses instead of hardware based ones
+slaac private
+
 # A hook script is provided to lookup the hostname if not set by the DHCP
 # server, but it should not be run by default.
 nohook lookup-hostname
diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index 845bce43..7bed0bcc 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -455,9 +455,6 @@ Subsequent options are only parsed for this wireless
 .Ar ssid .
 .It Ic slaac Op Ar hwaddr | Ar private
 Selects the interface identifier used for SLAAC generated IPv6 addresses.
-.Ar private
-is the default and complies with
-.%R RFC 7217.
 .It Ic static Ar value
 Configures a static
 .Ar value .
diff --git a/if-options.c b/if-options.c
index 34476088..b388f40f 100644
--- a/if-options.c
+++ b/if-options.c
@@ -1952,7 +1952,6 @@ read_config(struct dhcpcd_ctx *ctx,
 #endif
 #ifdef INET6
 	ifo->options |= DHCPCD_IPV6 | DHCPCD_IPV6RS | DHCPCD_IPV6RA_REQRDNSS;
-	ifo->options |= DHCPCD_SLAACPRIVATE;
 	ifo->options |= DHCPCD_DHCP6;
 #endif
 	ifo->timeout = DEFAULT_TIMEOUT;