confile: add clearer for lxc.init_gid

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-05-31 18:28:57 +02:00
parent ec76dcfb4b
commit 1044b247c4
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D

View File

@ -238,6 +238,7 @@ 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 get_config_init_gid(const char *, char *, int, struct lxc_conf *);
static int clr_config_init_gid(const char *, struct lxc_conf *);
static int set_config_ephemeral(const char *, const char *, struct lxc_conf *);
static int get_config_ephemeral(const char *, char *, int, struct lxc_conf *);
@ -319,7 +320,7 @@ static struct lxc_config_t config[] = {
{ "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_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, clr_config_init_gid, },
{ "lxc.ephemeral", set_config_ephemeral, get_config_ephemeral, NULL },
{ "lxc.syslog", set_config_syslog, get_config_syslog, clr_config_syslog, },
{ "lxc.no_new_privs", set_config_no_new_privs, get_config_no_new_privs, NULL },
@ -2773,9 +2774,6 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
if (strncmp(key, "lxc.limit", 9) == 0) {
ret = lxc_clear_limits(c, key);
} else if (strcmp(key, "lxc.init_gid") == 0) {
c->init_gid = 0;
} else if (strcmp(key, "lxc.ephemeral") == 0) {
c->ephemeral = 0;
@ -4233,3 +4231,9 @@ static inline int clr_config_init_uid(const char *key, struct lxc_conf *c)
c->init_uid = 0;
return 0;
}
static inline int clr_config_init_gid(const char *key, struct lxc_conf *c)
{
c->init_gid = 0;
return 0;
}