From: Stéphane Graber <stgraber@ubuntu.com>
Date: Fri, 24 Jan 2014 20:20:04 +0000 (-0500)
Subject: conf: Fix clear_config_item on lxc.network entries
X-Git-Tag: lxc-1.0.0.beta3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52d21d40513fe6bbee005859444d34bea292cb4b;p=thirdparty%2Flxc.git

conf: Fix clear_config_item on lxc.network entries

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 64a9fb375..71b34073e 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3709,51 +3709,51 @@ int lxc_clear_nic(struct lxc_conf *c, const char *key)
 
 	if (!p1) {
 		lxc_remove_nic(it);
-	} else if (strcmp(p1, "ipv4") == 0) {
+	} else if (strcmp(p1, ".ipv4") == 0) {
 		struct lxc_list *it2,*next;
 		lxc_list_for_each_safe(it2, &netdev->ipv4, next) {
 			lxc_list_del(it2);
 			free(it2->elem);
 			free(it2);
 		}
-	} else if (strcmp(p1, "ipv6") == 0) {
+	} else if (strcmp(p1, ".ipv6") == 0) {
 		struct lxc_list *it2,*next;
 		lxc_list_for_each_safe(it2, &netdev->ipv6, next) {
 			lxc_list_del(it2);
 			free(it2->elem);
 			free(it2);
 		}
-	} else if (strcmp(p1, "link") == 0) {
+	} else if (strcmp(p1, ".link") == 0) {
 		if (netdev->link) {
 			free(netdev->link);
 			netdev->link = NULL;
 		}
-	} else if (strcmp(p1, "name") == 0) {
+	} else if (strcmp(p1, ".name") == 0) {
 		if (netdev->name) {
 			free(netdev->name);
 			netdev->name = NULL;
 		}
-	} else if (strcmp(p1, "script.up") == 0) {
+	} else if (strcmp(p1, ".script.up") == 0) {
 		if (netdev->upscript) {
 			free(netdev->upscript);
 			netdev->upscript = NULL;
 		}
-	} else if (strcmp(p1, "hwaddr") == 0) {
+	} else if (strcmp(p1, ".hwaddr") == 0) {
 		if (netdev->hwaddr) {
 			free(netdev->hwaddr);
 			netdev->hwaddr = NULL;
 		}
-	} else if (strcmp(p1, "mtu") == 0) {
+	} else if (strcmp(p1, ".mtu") == 0) {
 		if (netdev->mtu) {
 			free(netdev->mtu);
 			netdev->mtu = NULL;
 		}
-	} else if (strcmp(p1, "ipv4_gateway") == 0) {
+	} else if (strcmp(p1, ".ipv4_gateway") == 0) {
 		if (netdev->ipv4_gateway) {
 			free(netdev->ipv4_gateway);
 			netdev->ipv4_gateway = NULL;
 		}
-	} else if (strcmp(p1, "ipv6_gateway") == 0) {
+	} else if (strcmp(p1, ".ipv6_gateway") == 0) {
 		if (netdev->ipv6_gateway) {
 			free(netdev->ipv6_gateway);
 			netdev->ipv6_gateway = NULL;