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

confile: add clearer for lxc.logfile

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

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 68804bbfb..e2b619cba 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -109,6 +109,7 @@ static int clr_config_loglevel(const char *, struct lxc_conf *);
 
 static int set_config_logfile(const char *, const char *, struct lxc_conf *);
 static int get_config_logfile(const char *, char *, int, struct lxc_conf *);
+static int clr_config_logfile(const char *, struct lxc_conf *);
 
 static int set_config_mount(const char *, const char *, struct lxc_conf *);
 static int get_config_mount(const char *, char *, int, struct lxc_conf *);
@@ -235,7 +236,7 @@ static struct lxc_config_t config[] = {
 	{ "lxc.cgroup",               set_config_cgroup,               get_config_cgroup,            clr_config_cgroup,            },
 	{ "lxc.id_map",               set_config_idmaps,               get_config_idmaps,            clr_config_idmaps,            },
 	{ "lxc.loglevel",             set_config_loglevel,             get_config_loglevel,          clr_config_loglevel,          },
-	{ "lxc.logfile",              set_config_logfile,              get_config_logfile,           NULL },
+	{ "lxc.logfile",              set_config_logfile,              get_config_logfile,           clr_config_logfile,           },
 	{ "lxc.mount.entry",          set_config_mount,                get_config_mount,             NULL },
 	{ "lxc.mount.auto",           set_config_mount_auto,           get_config_mount_auto,        NULL },
 	{ "lxc.mount",                set_config_fstab,	               get_config_fstab,             NULL },
@@ -2832,10 +2833,6 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
 		free(c->seccomp);
 		c->seccomp = NULL;
 
-	} else if (strcmp(key, "lxc.logfile") == 0) {
-		free(c->logfile);
-		c->logfile = NULL;
-
 	} else if (strcmp(key, "lxc.monitor.unshare") == 0) {
 		c->monitor_unshare = 0;
 
@@ -4123,3 +4120,10 @@ static inline int clr_config_loglevel(const char *key, struct lxc_conf *c)
 	c->loglevel = LXC_LOG_PRIORITY_NOTSET;
 	return 0;
 }
+
+static inline int clr_config_logfile(const char *key, struct lxc_conf *c)
+{
+	free(c->logfile);
+	c->logfile = NULL;
+	return 0;
+}