From: Roy Marples <roy@marples.name>
Date: Thu, 11 Sep 2014 13:29:56 +0000 (+0000)
Subject: Improve the waitip test.
X-Git-Tag: v6.4.4~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0e347ff5742c7d47f19bf76ec6c70ebfff29312;p=thirdparty%2Fdhcpcd.git

Improve the waitip test.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 8dbebd7a..ece6507a 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -234,9 +234,8 @@ dhcpcd_ipwaited(struct dhcpcd_ctx *ctx)
 	    !ipv6nd_addrexists(ctx, NULL) &&
 	    !dhcp6_addrexists(ctx, NULL))
 		return 0;
-	if ((ctx->options &
-	    (DHCPCD_WAITIP | DHCPCD_WAITIP4 | DHCPCD_WAITIP6)) ==
-	    (DHCPCD_WAITIP | DHCPCD_WAITIP4 | DHCPCD_WAITIP6) &&
+	if (ctx->options & DHCPCD_WAITIP &&
+	    !(ctx->options & (DHCPCD_WAITIP4 | DHCPCD_WAITIP6)) &&
 	    !ipv4_addrexists(ctx, NULL) &&
 	    !ipv6nd_addrexists(ctx, NULL) &&
 	    !dhcp6_addrexists(ctx, NULL))