diff options
| author | sbyx <steven@midlink.org> | 2014-01-23 02:58:32 -0800 |
|---|---|---|
| committer | sbyx <steven@midlink.org> | 2014-01-23 02:58:32 -0800 |
| commit | f0b46eb203e192f44d8f870f905697ae4612d111 (patch) | |
| tree | f36e8a51df87a17b9034118edce322875a82d662 | |
| parent | 482a8b369deca0c485b5d39e5ac302ed5ad42499 (diff) | |
| parent | b228e0f242d5ae7f3976215bdb20c1e65be1cd40 (diff) | |
Merge pull request #9 from dedeckeh/bugfixes
Fix ra_management and ndproxy_routing config overwrite
| -rw-r--r-- | src/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
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])) |