X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fdhcpv6.c;h=f128ed88fa52e82a064c9c4065a4dbc14dd4a4a7;hb=357ecc1f5163bc7f74c64f4bca387e8d44a2eac5;hp=50bbb0225cf20755f320c8906d03613de0598df2;hpb=11ba58c6636f95c5ca35fd2d1ebcbefa696cf8dd;p=odhcp6c.git

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 50bbb02..f128ed8 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -744,18 +744,21 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 			if (ia_hdr->iaid != 1 || l_t2 < l_t1)
 				continue;
 
-			bool error = false;
+			int error = 0;
 			uint16_t stype, slen;
 			uint8_t *sdata;
 			// Test status and bail if error
 			dhcpv6_for_each_option(&ia_hdr[1], odata + olen,
 					stype, slen, sdata)
-				if (stype == DHCPV6_OPT_STATUS && slen >= 2 &&
-						(sdata[0] || sdata[1]))
-					error = true;
-
-			if (error)
-				continue;
+				if (stype == DHCPV6_OPT_STATUS && slen >= 2)
+					error = ((int)sdata[0]) << 8 | ((int)sdata[1]);
+
+			if (error) {
+				syslog(LOG_WARNING, "Server returned IAID status %i!", error);
+				if (error != 2)
+					raise(SIGUSR2);
+				break;
+			}
 
 			uint32_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen);