From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 26 Mar 2013 13:22:05 +0000 (+0200)
Subject: Merge branch 'master' into hnet
X-Git-Tag: debian/1.1+git20160131-1~133^2~5
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=commitdiff_plain;h=fa2696854e200258d266e8655b65259e9117a050;hp=95ec756737ef80ce929de4bd63cc2291eb6497b2

Merge branch 'master' into hnet
---

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 013e215..7e62a2b 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -648,6 +648,7 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 			if (ia_hdr->iaid != 1 || l_t2 < l_t1)
 				continue;
 
+			bool error = false;
 			uint16_t stype, slen;
 			uint8_t *sdata;
 			// Test status and bail if error
@@ -655,7 +656,10 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 					stype, slen, sdata)
 				if (stype == DHCPV6_OPT_STATUS && slen >= 2 &&
 						(sdata[0] || sdata[1]))
-					continue;
+					error = true;
+
+			if (error)
+				continue;
 
 			// Update times
 			if (l_t1 > 0 && t1 > l_t1)