From: Hans Dedecker <hans.dedecker@technicolor.com>
Date: Thu, 23 Jan 2014 09:53:22 +0000 (+0100)
Subject: Fix ra_management and ndproxy_routing config overwrite
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=commitdiff_plain;h=b228e0f242d5ae7f3976215bdb20c1e65be1cd40

Fix ra_management and ndproxy_routing config overwrite

Set default values for the ra_management and ndproxy_routing
config parameters if no attributes are present and overwrite is
to true.
---

diff --git a/src/config.c b/src/config.c
index 8e42ffa..cac2d09 100644
--- a/src/config.c
+++ b/src/config.c
@@ -454,7 +454,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
 	if ((c = tb[IFACE_ATTR_RA_MANAGEMENT]))
 		iface->managed = blobmsg_get_u32(c);
-	else
+	else if (overwrite)
 		iface->managed = 1;
 
 	if ((c = tb[IFACE_ATTR_RA_OFFLINK]))
@@ -475,7 +475,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
 	if ((c = tb[IFACE_ATTR_NDPROXY_ROUTING]))
 		iface->learn_routes = blobmsg_get_bool(c);
-	else
+	else if (overwrite)
 		iface->learn_routes = true;
 
 	if ((c = tb[IFACE_ATTR_NDPROXY_SLAVE]))