From d3a178ded37f84ed74640cc597da0e5c0fecdfa4 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 31 May 2017 15:12:18 +0200 Subject: [PATCH] confile: add clearer for lxc.id_map Signed-off-by: Christian Brauner --- src/lxc/confile.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 2c2690402..f28969620 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -101,6 +101,7 @@ static int clr_config_cgroup(const char *, struct lxc_conf *); static int set_config_idmaps(const char *, const char *, struct lxc_conf *); static int get_config_idmaps(const char *, char *, int, struct lxc_conf *); +static int clr_config_idmaps(const char *, struct lxc_conf *); static int set_config_loglevel(const char *, const char *, struct lxc_conf *); static int get_config_loglevel(const char *, char *, int, struct lxc_conf *); @@ -231,7 +232,7 @@ static struct lxc_config_t config[] = { { "lxc.aa_allow_incomplete", set_config_lsm_aa_incomplete, get_config_lsm_aa_incomplete, clr_config_lsm_aa_incomplete, }, { "lxc.se_context", set_config_lsm_se_context, get_config_lsm_se_context, clr_config_lsm_se_context, }, { "lxc.cgroup", set_config_cgroup, get_config_cgroup, clr_config_cgroup, }, - { "lxc.id_map", set_config_idmaps, get_config_idmaps, NULL }, + { "lxc.id_map", set_config_idmaps, get_config_idmaps, clr_config_idmaps, }, { "lxc.loglevel", set_config_loglevel, get_config_loglevel, NULL }, { "lxc.logfile", set_config_logfile, get_config_logfile, NULL }, { "lxc.mount.entry", set_config_mount, get_config_mount, NULL }, @@ -2766,9 +2767,6 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key) } else if (strncmp(key, "lxc.environment", 15) == 0) { ret = lxc_clear_environment(c); - } else if (strncmp(key, "lxc.id_map", 10) == 0) { - ret = lxc_clear_idmaps(c); - } else if (strncmp(key, "lxc.limit", 9) == 0) { ret = lxc_clear_limits(c, key); @@ -4116,3 +4114,8 @@ static inline int clr_config_cgroup(const char *key, struct lxc_conf *c) { return lxc_clear_cgroups(c, key); } + +static inline int clr_config_idmaps(const char *key, struct lxc_conf *c) +{ + return lxc_clear_idmaps(c); +}