From: Vladislav Grishenko <themiron@mail.ru>
Date: Mon, 13 Jul 2015 13:12:41 +0000 (+0500)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.1+git20160131-1~11^2
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=commitdiff_plain;h=b30bce275255b48de02783e85b8cb3e0ba9dea2e;hp=4a169b02b003fe50b2bccdf6b8c78a4de245669f

Merge branch 'upstream'
---

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index a3e0a18..cfa3f29 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -797,18 +797,6 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
 		if (otype == DHCPV6_OPT_SERVERID && olen <= 130) {
 			memcpy(cand.duid, odata, olen);
 			cand.duid_len = olen;
-		} else if (otype == DHCPV6_OPT_STATUS && olen >= 2) {
-			int error = ((int)odata[0] << 8 | (int)odata[1]);
-
-			switch (error) {
-			case DHCPV6_NoPrefixAvail:
-				// Status code on global level
-				cand.preference -= 2000;
-				break;
-
-			default :
-				break;
-			}
 		} else if (otype == DHCPV6_OPT_PREF && olen >= 1 &&
 				cand.preference >= 0) {
 			cand.preference = pref = odata[0];