From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 30 May 2017 02:58:03 +0000 (+0200)
Subject: confile: config_includefile()
X-Git-Tag: lxc-2.1.0~110^2~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=355c5701bf6c4cb9dd4f35ee7dcd6ea2b5f3e976;p=thirdparty%2Flxc.git

confile: config_includefile()

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

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 8af729ea5..5b2e05f28 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2171,11 +2171,15 @@ out:
 }
 
 static int config_includefile(const char *key, const char *value,
-			  struct lxc_conf *lxc_conf)
+			      struct lxc_conf *lxc_conf)
 {
-	if (config_value_empty(value))
+	/* Set config value to default. */
+	if (config_value_empty(value)) {
+		lxc_clear_config_item(lxc_conf, key);
 		return 0;
+	}
 
+	/* Parse new config value. */
 	if (is_dir(value))
 		return do_includedir(value, lxc_conf);