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

confile: add clearer for lxc.utsname

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

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index f29ebdf78..70ab669bf 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -145,6 +145,7 @@ static int clr_config_pivotdir(const char *, struct lxc_conf *);
 
 static int set_config_utsname(const char *, const char *, struct lxc_conf *);
 static int get_config_utsname(const char *, char *, int, struct lxc_conf *);
+static int clr_config_utsname(const char *, struct lxc_conf *);
 
 static int set_config_hooks(const char *, const char *, struct lxc_conf *lxc_conf);
 static int get_config_hooks(const char *, char *, int, struct lxc_conf *);
@@ -253,7 +254,7 @@ static struct lxc_config_t config[] = {
 	{ "lxc.rootfs.backend",       set_config_rootfs_backend,       get_config_rootfs_backend,    clr_config_rootfs_backend,    },
 	{ "lxc.rootfs",               set_config_rootfs,               get_config_rootfs,            clr_config_rootfs,            },
 	{ "lxc.pivotdir",             set_config_pivotdir,             get_config_pivotdir,          clr_config_pivotdir,          },
-	{ "lxc.utsname",              set_config_utsname,              get_config_utsname,           NULL },
+	{ "lxc.utsname",              set_config_utsname,              get_config_utsname,           clr_config_utsname,           },
 	{ "lxc.hook.pre-start",       set_config_hooks,                get_config_hooks,             NULL },
 	{ "lxc.hook.pre-mount",       set_config_hooks,                get_config_hooks,             NULL },
 	{ "lxc.hook.mount",           set_config_hooks,                get_config_hooks,             NULL },
@@ -2774,10 +2775,6 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
 	} else if (strncmp(key, "lxc.limit", 9) == 0) {
 		ret = lxc_clear_limits(c, key);
 
-	} else if (strcmp(key, "lxc.utsname") == 0) {
-		free(c->utsname);
-		c->utsname = NULL;
-
 	} else if (strcmp(key, "lxc.haltsignal") == 0) {
 		c->haltsignal = 0;
 
@@ -4159,3 +4156,10 @@ static inline int clr_config_pivotdir(const char *key, struct lxc_conf *c)
 {
 	return 0;
 }
+
+static inline int clr_config_utsname(const char *key, struct lxc_conf *c)
+{
+	free(c->utsname);
+	c->utsname = NULL;
+	return 0;
+}