From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 6 Feb 2017 22:08:26 +0000 (+0100)
Subject: confile: clear lxc.network.<n>.ipv{4,6} when empty
X-Git-Tag: lxc-1.0.10~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8164a74ff49466851f2fbb4f0cb78906793405b;p=thirdparty%2Flxc.git

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

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index eec19acd7..8c5ebcb58 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -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;