Fix ra_management and ndproxy_routing config overwrite
authorHans Dedecker <hans.dedecker@technicolor.com>
Thu, 23 Jan 2014 09:53:22 +0000 (10:53 +0100)
committerHans Dedecker <hans.dedecker@technicolor.com>
Thu, 23 Jan 2014 09:53:22 +0000 (10:53 +0100)
Set default values for the ra_management and ndproxy_routing
config parameters if no attributes are present and overwrite is
to true.

src/config.c

index 8e42ffa..cac2d09 100644 (file)
@@ -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]))