From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 31 May 2017 16:06:54 +0000 (+0200)
Subject: confile: add clearer for lxc.console
X-Git-Tag: lxc-2.1.0~110^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e5b633f10e01cce4d5d04b89cd2962449a5e014;p=thirdparty%2Flxc.git

confile: add clearer for lxc.console

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

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 778329a54..6ead385eb 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -181,12 +181,13 @@ static int set_config_cap_keep(const char *, const char *, struct lxc_conf *);
 static int get_config_cap_keep(const char *, char *, int, struct lxc_conf *);
 static int clr_config_cap_keep(const char *, struct lxc_conf *);
 
-static int set_config_console(const char *, const char *, struct lxc_conf *);
-static int get_config_console(const char *, char *, int, struct lxc_conf *);
-
 static int set_config_console_logfile(const char *, const char *, struct lxc_conf *);
 static int get_config_console_logfile(const char *, char *, int, struct lxc_conf *);
 
+static int set_config_console(const char *, const char *, struct lxc_conf *);
+static int get_config_console(const char *, char *, int, struct lxc_conf *);
+static int clr_config_console(const char *, struct lxc_conf *);
+
 static int set_config_seccomp(const char *, const char *, struct lxc_conf *);
 static int get_config_seccomp(const char *, char *, int, struct lxc_conf *);
 
@@ -290,7 +291,7 @@ static struct lxc_config_t config[] = {
 	{ "lxc.cap.drop",             set_config_cap_drop,             get_config_cap_drop,          clr_config_cap_drop,          },
 	{ "lxc.cap.keep",             set_config_cap_keep,             get_config_cap_keep,          clr_config_cap_keep,          },
 	{ "lxc.console.logfile",      set_config_console_logfile,      get_config_console_logfile,   NULL },
-	{ "lxc.console",              set_config_console,              get_config_console,           NULL },
+	{ "lxc.console",              set_config_console,              get_config_console,           clr_config_console,           },
 	{ "lxc.seccomp",              set_config_seccomp,              get_config_seccomp,           NULL },
 	{ "lxc.include",              set_config_includefile,          NULL,                         NULL },
 	{ "lxc.autodev",              set_config_autodev,              get_config_autodev,           NULL },
@@ -2791,10 +2792,6 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
 		free(c->console.log_path);
 		c->console.log_path = NULL;
 
-	} else if (strcmp(key, "lxc.console") == 0) {
-		free(c->console.path);
-		c->console.path = NULL;
-
 	} else if (strcmp(key, "lxc.autodev") == 0) {
 		c->autodev = 1;
 
@@ -4178,3 +4175,11 @@ static inline int clr_config_cap_keep(const char *key, struct lxc_conf *c)
 {
 	return lxc_clear_config_keepcaps(c);
 }
+
+static inline int clr_config_console(const char *key, struct lxc_conf *c)
+{
+	free(c->console.path);
+	c->console.path = NULL;
+	return 0;
+}
+