Unverified Commit bcaa172c by Christian Brauner Committed by Stéphane Graber

confile: add clearer for lxc.init_uid

parent b94f4070
...@@ -225,6 +225,7 @@ static int clr_config_init_cmd(const char *, struct lxc_conf *); ...@@ -225,6 +225,7 @@ static int clr_config_init_cmd(const char *, struct lxc_conf *);
static int set_config_init_uid(const char *, const char *, struct lxc_conf *); static int set_config_init_uid(const char *, const char *, struct lxc_conf *);
static int get_config_init_uid(const char *, char *, int, struct lxc_conf *); static int get_config_init_uid(const char *, char *, int, struct lxc_conf *);
static int clr_config_init_uid(const char *, struct lxc_conf *);
static int set_config_init_gid(const char *, const char *, struct lxc_conf *); static int set_config_init_gid(const char *, const char *, struct lxc_conf *);
static int get_config_init_gid(const char *, char *, int, struct lxc_conf *); static int get_config_init_gid(const char *, char *, int, struct lxc_conf *);
...@@ -298,7 +299,7 @@ static struct lxc_config_t config[] = { ...@@ -298,7 +299,7 @@ static struct lxc_config_t config[] = {
{ "lxc.group", set_config_group, get_config_group, clr_config_group, }, { "lxc.group", set_config_group, get_config_group, clr_config_group, },
{ "lxc.environment", set_config_environment, get_config_environment, clr_config_environment, }, { "lxc.environment", set_config_environment, get_config_environment, clr_config_environment, },
{ "lxc.init_cmd", set_config_init_cmd, get_config_init_cmd, clr_config_init_cmd, }, { "lxc.init_cmd", set_config_init_cmd, get_config_init_cmd, clr_config_init_cmd, },
{ "lxc.init_uid", set_config_init_uid, get_config_init_uid, NULL }, { "lxc.init_uid", set_config_init_uid, get_config_init_uid, clr_config_init_uid, },
{ "lxc.init_gid", set_config_init_gid, get_config_init_gid, NULL }, { "lxc.init_gid", set_config_init_gid, get_config_init_gid, NULL },
{ "lxc.ephemeral", set_config_ephemeral, get_config_ephemeral, NULL }, { "lxc.ephemeral", set_config_ephemeral, get_config_ephemeral, NULL },
}; };
...@@ -2564,10 +2565,7 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key) ...@@ -2564,10 +2565,7 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
{ {
int ret = 0; int ret = 0;
if (strcmp(key, "lxc.init_uid") == 0) { if (strcmp(key, "lxc.init_gid") == 0) {
c->init_uid = 0;
} else if (strcmp(key, "lxc.init_gid") == 0) {
c->init_gid = 0; c->init_gid = 0;
} else if (strcmp(key, "lxc.ephemeral") == 0) { } else if (strcmp(key, "lxc.ephemeral") == 0) {
...@@ -3888,3 +3886,9 @@ static inline int clr_config_init_cmd(const char *key, struct lxc_conf *c) ...@@ -3888,3 +3886,9 @@ static inline int clr_config_init_cmd(const char *key, struct lxc_conf *c)
c->init_cmd = NULL; c->init_cmd = NULL;
return 0; return 0;
} }
static inline int clr_config_init_uid(const char *key, struct lxc_conf *c)
{
c->init_uid = 0;
return 0;
}
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