]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
confile: clear lxc.network.<n>.ipv{4,6} when empty
authorChristian Brauner <christian.brauner@ubuntu.com>
Mon, 6 Feb 2017 22:08:26 +0000 (23:08 +0100)
committerStéphane Graber <stgraber@ubuntu.com>
Mon, 20 Mar 2017 21:43:55 +0000 (17:43 -0400)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/confile.c

index eec19acd7e6877988ac032684f15b8c79588154b..8c5ebcb58b72369419c01c7e67c242f612b7371b 100644 (file)
@@ -747,6 +747,9 @@ static int config_network_ipv4(const char *key, const char *value,
        struct lxc_list *list;
        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);
        if (!netdev)
                return -1;
@@ -870,6 +873,9 @@ static int config_network_ipv6(const char *key, const char *value,
        char *slash,*valdup;
        char *netmask;
 
+       if (!value || !strlen(value))
+               return lxc_clear_config_item(lxc_conf, key);
+
        netdev = network_netdev(key, value, &lxc_conf->network);
        if (!netdev)
                return -1;