From: Roy Marples <roy@marples.name>
Date: Mon, 1 Jul 2013 19:34:54 +0000 (+0000)
Subject: Fix prior patch
X-Git-Tag: v6.0.3~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=302025a6b91f7643b0e56f05676ef9ab25180350;p=thirdparty%2Fdhcpcd.git

Fix prior patch
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 6b15de86..d68dc4a8 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -314,9 +314,9 @@ configure_interface1(struct interface *ifp)
 
 	/* We want to disable kernel interface RA as early as possible. */
 	if (ifo->options & DHCPCD_IPV6RS) {
-		ra_global = check_ipv6(NULL, options & DHCPCD_IPV6RA_OWN);
+		ra_global = check_ipv6(NULL, options & DHCPCD_IPV6RA_OWN ? 1:0);
 		ra_iface = check_ipv6(ifp->name,
-		    ifp->options->options & DHCPCD_IPV6RA_OWN);
+		    ifp->options->options & DHCPCD_IPV6RA_OWN ? 1 : 0);
 		if (ra_global == -1 || ra_iface == -1)
 			ifo->options &= ~DHCPCD_IPV6RS;
 		else if (ra_iface == 0)