confile: add clearer for lxc.group

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
lxc · Jul 16, 2017 · bf2ce93 · bf2ce93
1 parent dc1837d
commit bf2ce93
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
@@ -213,6 +213,7 @@ static int clr_config_monitor(const char *, struct lxc_conf *);
 
 static int set_config_group(const char *, const char *, struct lxc_conf *);
 static int get_config_group(const char *, char *, int, struct lxc_conf *);
+static int clr_config_group(const char *, struct lxc_conf *);
 
 static int set_config_environment(const char *, const char *, struct lxc_conf *);
 static int get_config_environment(const char *, char *, int, struct lxc_conf *);
@@ -292,7 +293,7 @@ static struct lxc_config_t config[] = {
 	{ "lxc.start.delay",          set_config_start,                get_config_start,             clr_config_start,             },
 	{ "lxc.start.order",          set_config_start,                get_config_start,             clr_config_start,             },
 	{ "lxc.monitor.unshare",      set_config_monitor,              get_config_monitor,           clr_config_monitor,           },
-	{ "lxc.group",                set_config_group,                get_config_group,             NULL },
+	{ "lxc.group",                set_config_group,                get_config_group,             clr_config_group,             },
 	{ "lxc.environment",          set_config_environment,          get_config_environment,       NULL },
 	{ "lxc.init_cmd",             set_config_init_cmd,             get_config_init_cmd,          NULL },
 	{ "lxc.init_uid",             set_config_init_uid,             get_config_init_uid,          NULL },
@@ -2561,10 +2562,7 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
 {
 	int ret = 0;
 
-	if (strncmp(key, "lxc.group", 9) == 0) {
-		ret = lxc_clear_groups(c);
-
-	} else if (strncmp(key, "lxc.environment", 15) == 0) {
+	if (strncmp(key, "lxc.environment", 15) == 0) {
 		ret = lxc_clear_environment(c);
 
 	} else if (strcmp(key, "lxc.init_cmd") == 0) {
@@ -3878,3 +3876,9 @@ static inline int clr_config_monitor(const char *key, struct lxc_conf *c)
 	c->monitor_unshare = 0;
 	return 0;
 }
+
+static inline int clr_config_group(const char *key, struct lxc_conf *c)
+{
+	return lxc_clear_groups(c);
+}
+}