conf: fix lxc.prlimit clearing

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-12-11 06:22:56 +01:00
parent 4bc717d6e3
commit b668653c52
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D

View File

@ -3293,13 +3293,12 @@ int lxc_clear_limits(struct lxc_conf *c, const char *key)
bool all = false;
const char *k = NULL;
if (strcmp(key, "lxc.limit") == 0
|| strcmp(key, "lxc.prlimit"))
if (strcmp(key, "lxc.limit") == 0 || strcmp(key, "lxc.prlimit") == 0)
all = true;
else if (strncmp(key, "lxc.limit.", sizeof("lxc.limit.")-1) == 0)
k = key + sizeof("lxc.limit.")-1;
else if (strncmp(key, "lxc.prlimit.", sizeof("lxc.prlimit.")-1) == 0)
k = key + sizeof("lxc.prlimit.")-1;
else if (strncmp(key, "lxc.limit.", sizeof("lxc.limit.") - 1) == 0)
k = key + sizeof("lxc.limit.") - 1;
else if (strncmp(key, "lxc.prlimit.", sizeof("lxc.prlimit.") - 1) == 0)
k = key + sizeof("lxc.prlimit.") - 1;
else
return -1;
@ -3312,6 +3311,7 @@ int lxc_clear_limits(struct lxc_conf *c, const char *key)
free(lim);
free(it);
}
return 0;
}