X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=372ea6782701630f0b9b02da12e1f22b06996273;hp=8b0d9458287d6c951c500fd50f62a1450d2ef317;hb=3af23ad72888393a863d7be545d1bd5af99ca442;hpb=41b52688403016017eca812315a7206b6d27c097;ds=sidebyside

diff --git a/src/config.c b/src/config.c
index 8b0d945..372ea67 100644
--- a/src/config.c
+++ b/src/config.c
@@ -333,6 +333,11 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 			return -1;
 
 		strncpy(iface->name, name, sizeof(iface->name) - 1);
+
+		/* Default settings */
+		iface->managed = 1;
+		iface->learn_routes = true;
+
 		list_add(&iface->head, &interfaces);
 		overwrite = true;
 	}
@@ -533,8 +538,6 @@ 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 if (overwrite)
-		iface->managed = 1;
 
 	if ((c = tb[IFACE_ATTR_RA_OFFLINK]))
 		iface->ra_not_onlink = blobmsg_get_bool(c);
@@ -568,8 +571,6 @@ 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 if (overwrite)
-		iface->learn_routes = true;
 
 	if ((c = tb[IFACE_ATTR_NDPROXY_SLAVE]))
 		iface->external = blobmsg_get_bool(c);