Unverified Commit 86b0cf23 by Christian Brauner Committed by Stéphane Graber

confile: clear lxc.network.<n>.ipv{4,6} when empty

parent 3cd2868b
...@@ -790,6 +790,9 @@ static int config_network_ipv4(const char *key, const char *value, ...@@ -790,6 +790,9 @@ static int config_network_ipv4(const char *key, const char *value,
struct lxc_list *list; struct lxc_list *list;
char *cursor, *slash, *addr = NULL, *bcast = NULL, *prefix = NULL; char *cursor, *slash, *addr = NULL, *bcast = NULL, *prefix = NULL;
if (!value || !strlen(value))
return lxc_clear_config_item(lxc_conf, key);
netdev = network_netdev(key, value, &lxc_conf->network); netdev = network_netdev(key, value, &lxc_conf->network);
if (!netdev) if (!netdev)
return -1; return -1;
...@@ -917,6 +920,9 @@ static int config_network_ipv6(const char *key, const char *value, ...@@ -917,6 +920,9 @@ static int config_network_ipv6(const char *key, const char *value,
char *slash,*valdup; char *slash,*valdup;
char *netmask; char *netmask;
if (!value || !strlen(value))
return lxc_clear_config_item(lxc_conf, key);
netdev = network_netdev(key, value, &lxc_conf->network); netdev = network_netdev(key, value, &lxc_conf->network);
if (!netdev) if (!netdev)
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment