Unverified Commit 079eff02 by Christian Brauner Committed by Stéphane Graber

confile: add clearer for lxc.id_map

parent 993e88fd
...@@ -92,6 +92,7 @@ static int clr_config_cgroup(const char *, struct lxc_conf *); ...@@ -92,6 +92,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 set_config_idmaps(const char *, const char *, struct lxc_conf *);
static int get_config_idmaps(const char *, char *, int, 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 set_config_loglevel(const char *, const char *, struct lxc_conf *);
static int get_config_loglevel(const char *, char *, int, struct lxc_conf *); static int get_config_loglevel(const char *, char *, int, struct lxc_conf *);
...@@ -213,7 +214,7 @@ static struct lxc_config_t config[] = { ...@@ -213,7 +214,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.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.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.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.loglevel", set_config_loglevel, get_config_loglevel, NULL },
{ "lxc.logfile", set_config_logfile, get_config_logfile, NULL }, { "lxc.logfile", set_config_logfile, get_config_logfile, NULL },
{ "lxc.mount.entry", set_config_mount, get_config_mount, NULL }, { "lxc.mount.entry", set_config_mount, get_config_mount, NULL },
...@@ -2562,9 +2563,6 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key) ...@@ -2562,9 +2563,6 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
} else if (strncmp(key, "lxc.environment", 15) == 0) { } else if (strncmp(key, "lxc.environment", 15) == 0) {
ret = lxc_clear_environment(c); ret = lxc_clear_environment(c);
} else if (strncmp(key, "lxc.id_map", 10) == 0) {
ret = lxc_clear_idmaps(c);
} else if (strcmp(key, "lxc.utsname") == 0) { } else if (strcmp(key, "lxc.utsname") == 0) {
free(c->utsname); free(c->utsname);
c->utsname = NULL; c->utsname = NULL;
...@@ -3770,3 +3768,8 @@ static inline int clr_config_cgroup(const char *key, struct lxc_conf *c) ...@@ -3770,3 +3768,8 @@ static inline int clr_config_cgroup(const char *key, struct lxc_conf *c)
{ {
return lxc_clear_cgroups(c, key); return lxc_clear_cgroups(c, key);
} }
static inline int clr_config_idmaps(const char *key, struct lxc_conf *c)
{
return lxc_clear_idmaps(c);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment