proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-06-15 11:57:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

confile.c: clear entries if no value

Browse Source 
For list configuration entries like capabilities and cgroups
entries, if there is a 'key =' value (i.e. "lxc.cap.drop =")
then clear any loaded entries.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Serge Hallyn 2013-12-02 13:17:34 -06:00
parent 5ff337745e
commit 7d0eb87eef
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lxc/conf.h
View File

@ -353,6 +353,7 @@ extern int lxc_clear_config_keepcaps(struct lxc_conf *c);
extern int lxc_clear_cgroups(struct lxc_conf *c, const char *key);
extern int lxc_clear_mount_entries(struct lxc_conf *c);
extern int lxc_clear_hooks(struct lxc_conf *c, const char *key);
extern int lxc_clear_idmaps(struct lxc_conf *c);
/*
* Configure the container from inside

23
src/lxc/confile.c
View File

@ -295,6 +295,9 @@ static int config_network_type(const char *key, const char *value,
struct lxc_netdev *netdev;
struct lxc_list *list;
if (!value || strlen(value) == 0)
return lxc_clear_config_network(lxc_conf);
netdev = malloc(sizeof(*netdev));
if (!netdev) {
SYSERROR("failed to allocate memory");
@ -865,7 +868,12 @@ static int config_seccomp(const char *key, const char *value,
static int config_hook(const char *key, const char *value,
struct lxc_conf *lxc_conf)
{
char *copy = strdup(value);
char *copy;
if (!value || strlen(value) == 0)
return lxc_clear_hooks(lxc_conf, key);
copy = strdup(value);
if (!copy) {
SYSERROR("failed to dup string '%s'", value);
return -1;
@ -1062,6 +1070,9 @@ static int config_cgroup(const char *key, const char *value,
struct lxc_list *cglist = NULL;
struct lxc_cgroup *cgelem = NULL;
if (!value || strlen(value) == 0)
return lxc_clear_cgroups(lxc_conf, key);
subkey = strstr(key, token);
if (!subkey)
@ -1123,6 +1134,9 @@ static int config_idmap(const char *key, const char *value, struct lxc_conf *lxc
char type;
int ret;
if (!value || strlen(value) == 0)
return lxc_clear_idmaps(lxc_conf);
subkey = strstr(key, token);
if (!subkey)
@ -1250,6 +1264,9 @@ static int config_mount(const char *key, const char *value,
char *mntelem;
struct lxc_list *mntlist;
if (!value || strlen(value) == 0)
return lxc_clear_mount_entries(lxc_conf);
subkey = strstr(key, token);
if (!subkey) {
@ -1294,7 +1311,7 @@ static int config_cap_keep(const char *key, const char *value,
int ret = -1;
if (!strlen(value))
return -1;
return lxc_clear_config_keepcaps(lxc_conf);
keepcaps = strdup(value);
if (!keepcaps) {
@ -1340,7 +1357,7 @@ static int config_cap_drop(const char *key, const char *value,
int ret = -1;
if (!strlen(value))
return -1;
return lxc_clear_config_caps(lxc_conf);
dropcaps = strdup(value);
if (!dropcaps) {