]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
confile: cleanup set_config_apparmor_allow_incomplete()
authorChristian Brauner <christian.brauner@ubuntu.com>
Tue, 8 Dec 2020 13:47:46 +0000 (14:47 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Tue, 8 Dec 2020 14:40:49 +0000 (15:40 +0100)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/confile.c

index 713c66386ad9aa8f76ae55ceb7465590451222ea..7dfd984230be9aa5182c9e3c97932ca6ff0f3e16 100644 (file)
@@ -1462,16 +1462,19 @@ static int set_config_apparmor_allow_incomplete(const char *key,
                                                struct lxc_conf *lxc_conf,
                                                void *data)
 {
+       int ret;
+
        if (lxc_config_value_empty(value)) {
                lxc_conf->lsm_aa_allow_incomplete = 0;
                return 0;
        }
 
-       if (lxc_safe_uint(value, &lxc_conf->lsm_aa_allow_incomplete) < 0)
-               return -1;
+       ret = lxc_safe_uint(value, &lxc_conf->lsm_aa_allow_incomplete);
+       if (ret)
+               return ret;
 
        if (lxc_conf->lsm_aa_allow_incomplete > 1)
-               return -1;
+               return ret_errno(EINVAL);
 
        return 0;
 }