Skip to content

L
lxc
Commit 920da314 by Stéphane Graber Committed by GitHub
Options

Merge pull request #1422 from brauner/2017-06-02/clear_config_vals

confile: clear lxc.network.<n>.ipv{4,6} when empty
parents 01b791a9 0797e123
Showing with 6 additions and 0 deletions
src/lxc/confile.c
...@@ -870,6 +870,9 @@ static int config_network_ipv4(const char *key, const char *value, ...@@ -870,6 +870,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;
...@@ -997,6 +1000,9 @@ static int config_network_ipv6(const char *key, const char *value, ...@@ -997,6 +1000,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