From: Christian Brauner Date: Wed, 31 May 2017 07:16:37 +0000 (+0200) Subject: confile: add getter for lxc.init_uid X-Git-Tag: lxc-2.1.0~110^2~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1398e9b102616a885e57770730a8424520c24d72;p=thirdparty%2Flxc.git confile: add getter for lxc.init_uid Signed-off-by: Christian Brauner --- diff --git a/src/lxc/confile.c b/src/lxc/confile.c index 136546d63..01155e87d 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -198,6 +198,8 @@ static int set_config_init_cmd(const char *, const char *, struct lxc_conf *); static int get_config_init_cmd(struct lxc_container *, const char *, char *, int); static int set_config_init_uid(const char *, const char *, struct lxc_conf *); +static int get_config_init_uid(struct lxc_container *, const char *, char *, int); + static int set_config_init_gid(const char *, const char *, struct lxc_conf *); static int set_config_ephemeral(const char *, const char *, struct lxc_conf *); static int set_config_no_new_privs(const char *, const char *, struct lxc_conf *); @@ -269,7 +271,7 @@ static struct lxc_config_t config[] = { { "lxc.group", set_config_group, get_config_group, NULL}, { "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, NULL, NULL}, + { "lxc.init_uid", set_config_init_uid, get_config_init_uid, NULL}, { "lxc.init_gid", set_config_init_gid, NULL, NULL}, { "lxc.ephemeral", set_config_ephemeral, NULL, NULL}, { "lxc.syslog", set_config_syslog, get_config_syslog, NULL}, @@ -2718,9 +2720,7 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv, { const char *v = NULL; - if (strcmp(key, "lxc.init_uid") == 0) - return lxc_get_conf_int(c, retv, inlen, c->init_uid); - else if (strcmp(key, "lxc.init_gid") == 0) + if (strcmp(key, "lxc.init_gid") == 0) return lxc_get_conf_int(c, retv, inlen, c->init_gid); else if (strcmp(key, "lxc.ephemeral") == 0) return lxc_get_conf_int(c, retv, inlen, c->ephemeral); @@ -3980,3 +3980,10 @@ static int get_config_init_cmd(struct lxc_container *c, const char *key, { return lxc_get_conf_str(retv, inlen, c->lxc_conf->init_cmd); } + +static int get_config_init_uid(struct lxc_container *c, const char *key, + char *retv, int inlen) +{ + return lxc_get_conf_int(c->lxc_conf, retv, inlen, + c->lxc_conf->init_uid); +}