X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=62ddab866ea5cc608f1596e7a99130db0f77818a;hp=4b694672455b25c8c3489f9099fbb8436cc40bdd;hb=e7098a5d1dbcabb12bc870ef6aa412c7b3235ab2;hpb=6c93cef912cc3f9b0bd0805bd66289d72bc315e5

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 4b69467..62ddab8 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -362,14 +362,16 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 		dhcpv4_put(&reply, &cookie, DHCPV4_OPT_MTU, 2, &mtu);
 	}
 
-	if (iface->search) {
-		char b[256];
-		if (dn_expand(iface->search, iface->search + iface->search_len,
-				iface->search, b, sizeof(b)) > 0)
-			dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DOMAIN, strlen(b), b);
+	if (iface->search && iface->search_len <= 255) {
+		dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SEARCH_DOMAIN,
+				iface->search_len, iface->search);
 	} else if (!res_init() && _res.dnsrch[0] && _res.dnsrch[0][0]) {
-		dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DOMAIN,
-				strlen(_res.dnsrch[0]), _res.dnsrch[0]);
+		uint8_t search_buf[256];
+		int len = dn_comp(_res.dnsrch[0], search_buf,
+						sizeof(search_buf), NULL, NULL);
+		if (len > 0)
+			dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SEARCH_DOMAIN,
+					len, search_buf);
 	}
 
 	dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, &ifaddr.sin_addr);
@@ -517,6 +519,9 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 			a = NULL;
 		}
 
+		if (a)
+			update_state = true;
+
 		if (assigned && a)
 			lease = a;
 	} else if (msg == DHCPV4_MSG_RELEASE) {