confile: config_includefile()

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

confile: config_includefile()
21304bdd · Christian Brauner · Stéphane Graber · 17444bef · 21304bdd
Unverified Commit 21304bdd authored May 30, 2017 by Christian Brauner Committed by Stéphane Graber Jul 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

confile.c src/lxc/confile.c +6 -2

No files found.
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -1983,11 +1983,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);