From: Steven Barth <steven@midlink.org>
Date: Tue, 9 Jun 2015 12:04:59 +0000 (+0200)
Subject: dhcpv6: clear CUSTOM_OPTS in a more sane manner
X-Git-Tag: debian/1.1+git20160131-1~13
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d21764d12bb799f89d42c94dc20d4adb6d588077;p=odhcp6c.git

dhcpv6: clear CUSTOM_OPTS in a more sane manner

Signed-off-by: Steven Barth <steven@midlink.org>
---

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 425aee1..760f235 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -948,6 +948,7 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
 		odhcp6c_clear_state(STATE_S46_MAPE);
 		odhcp6c_clear_state(STATE_S46_LW);
 		odhcp6c_clear_state(STATE_PASSTHRU);
+		odhcp6c_clear_state(STATE_CUSTOM_OPTS);
 
 		// Parse and find all matching IAs
 		dhcpv6_for_each_option(opt, end, otype, olen, odata) {
diff --git a/src/script.c b/src/script.c
index 219d034..dbdd89b 100644
--- a/src/script.c
+++ b/src/script.c
@@ -410,7 +410,4 @@ void script_call(const char *status)
 		execv(argv[0], argv);
 		_exit(128);
 	}
-
-	// Delete lost prefixes and user opts
-	odhcp6c_clear_state(STATE_CUSTOM_OPTS);
 }