From: Roy Marples <roy@marples.name>
Date: Wed, 22 Jul 2015 10:24:37 +0000 (+0000)
Subject: Clarify the automatic mapping of DHCPv4 to DHCPv6 options.
X-Git-Tag: v6.9.2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daa70372da5b2699e1a6c489f1b8d467430c7eba;p=thirdparty%2Fdhcpcd.git

Clarify the automatic mapping of DHCPv4 to DHCPv6 options.
---

diff --git a/dhcp6.c b/dhcp6.c
index dc6378f6..842e1316 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -3140,8 +3140,8 @@ dhcp6_start1(void *arg)
 	const struct dhcp_compat *dhc;
 
 	state = D6_STATE(ifp);
-	/* Match any DHCPv4 opton to DHCPv6 options if given for easy
-	 * configuration */
+	/* If no DHCPv6 options are configured,
+	   match configured DHCPv4 options to DHCPv6 equivalents. */
 	for (i = 0; i < sizeof(ifo->requestmask6); i++) {
 		if (ifo->requestmask6[i] != '\0')
 			break;
@@ -3157,7 +3157,7 @@ dhcp6_start1(void *arg)
 			add_option_mask(ifo->requestmask6, D6_OPTION_FQDN);
 	}
 
-	/* Rapid commit won't wor with Prefix Delegation Exclusion */
+	/* Rapid commit won't work with Prefix Delegation Exclusion */
 	if (dhcp6_findselfsla(ifp, NULL))
 		del_option_mask(ifo->requestmask6, D6_OPTION_RAPID_COMMIT);
 
diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index 87488439..d7025573 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 13, 2015
+.Dd July 22, 2015
 .Dt DHCPCD.CONF 5
 .Os
 .Sh NAME
@@ -471,7 +471,8 @@ lines.
 Prepend dhcp6_ to
 .Ar option
 to request a DHCPv6 option.
-DHCPv4 options are mapped to DHCPv6 where applicable.
+If no DHCPv6 options are configured,
+then DHCPv4 options are mapped to equivalent DHCPv6 options.
 .Pp
 Prepend nd_ to
 .Ar option