From: Roy Marples <roy@marples.name>
Date: Sun, 12 Oct 2014 19:58:46 +0000 (+0000)
Subject: Respect nodhcp6 earlier.
X-Git-Tag: v6.5.1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6794c786816e61547eddf02d791fcbf0a45a3d8;p=thirdparty%2Fdhcpcd.git

Respect nodhcp6 earlier.
---

diff --git a/ipv6nd.c b/ipv6nd.c
index 0af3b6af..0786b639 100644
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -1093,6 +1093,8 @@ ipv6nd_handlera(struct ipv6_ctx *ctx, struct interface *ifp,
 	eloop_timeout_delete(ifp->ctx->eloop, NULL, rap); /* reachable timer */
 
 handle_flag:
+	if (!(ifp->options->options & DHCPCD_DHCP6))
+		goto nodhcp6;
 	if (rap->flags & ND_RA_FLAG_MANAGED) {
 		if (new_data && dhcp6_start(ifp, DH6S_INIT) == -1)
 			syslog(LOG_ERR, "dhcp6_start: %s: %m", ifp->name);
@@ -1103,6 +1105,7 @@ handle_flag:
 		if (new_data)
 			syslog(LOG_DEBUG, "%s: No DHCPv6 instruction in RA",
 			    ifp->name);
+nodhcp6:
 		if (ifp->ctx->options & DHCPCD_TEST) {
 			eloop_exit(ifp->ctx->eloop, EXIT_SUCCESS);
 			return;