From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 31 May 2017 16:33:08 +0000 (+0200)
Subject: confile: add clearer for lxc.limit{.*}
X-Git-Tag: lxc-2.1.0~110^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=715ccc969ce9d92d0bd3315d7eaf82a0dac9143d;p=thirdparty%2Flxc.git

confile: add clearer for lxc.limit{.*}

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index eac8350db..6f13ae6d4 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -254,6 +254,7 @@ static int clr_config_no_new_privs(const char *, struct lxc_conf *);
 
 static int set_config_limit(const char *, const char *, struct lxc_conf *);
 static int get_config_limit(const char *, char *, int, struct lxc_conf *);
+static int clr_config_limit(const char *, struct lxc_conf *);
 
 static struct lxc_config_t config[] = {
 	{ "lxc.arch",                 set_config_personality,          get_config_personality,       clr_config_personality,       },
@@ -326,7 +327,7 @@ static struct lxc_config_t config[] = {
 	{ "lxc.ephemeral",            set_config_ephemeral,            get_config_ephemeral,         clr_config_ephemeral,         },
 	{ "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,      clr_config_no_new_privs,      },
-	{ "lxc.limit",                set_config_limit,                get_config_limit,             NULL },
+	{ "lxc.limit",                set_config_limit,                get_config_limit,             clr_config_limit,             },
 };
 
 struct signame {
@@ -2773,10 +2774,7 @@ int lxc_clear_config_item(struct lxc_conf *c, const char *key)
 {
 	int ret = 0;
 
-	if (strncmp(key, "lxc.limit", 9) == 0) {
-		ret = lxc_clear_limits(c, key);
-
-	} else if (strcmp(key, "lxc.include") == 0) {
+	if (strcmp(key, "lxc.include") == 0) {
 		lxc_clear_includes(c);
 
 	} else {
@@ -4245,3 +4243,8 @@ static inline int clr_config_no_new_privs(const char *key, struct lxc_conf *c)
 	c->no_new_privs = false;
 	return 0;
 }
+
+static inline int clr_config_limit(const char *key, struct lxc_conf *c)
+{
+	return lxc_clear_limits(c, key);
+}