Merge pull request #3947 from blenk92/fix-missing-seccomp

config: enable seccomp profile only when compiled with libseccomp
This commit is contained in:
Christian Brauner 2021-08-24 09:07:48 +02:00 committed by GitHub
commit a0738fa00b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1211,7 +1211,11 @@ static int set_config_seccomp_notify_proxy(const char *key, const char *value,
static int set_config_seccomp_profile(const char *key, const char *value, static int set_config_seccomp_profile(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
#ifdef HAVE_SECCOMP
return set_config_path_item(&lxc_conf->seccomp.seccomp, value); return set_config_path_item(&lxc_conf->seccomp.seccomp, value);
#else
return ret_set_errno(-1, ENOSYS);
#endif
} }
static int set_config_execute_cmd(const char *key, const char *value, static int set_config_execute_cmd(const char *key, const char *value,
@ -4383,7 +4387,11 @@ static int get_config_seccomp_notify_proxy(const char *key, char *retv, int inle
static int get_config_seccomp_profile(const char *key, char *retv, int inlen, static int get_config_seccomp_profile(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data) struct lxc_conf *c, void *data)
{ {
#ifdef HAVE_SECCOMP
return lxc_get_conf_str(retv, inlen, c->seccomp.seccomp); return lxc_get_conf_str(retv, inlen, c->seccomp.seccomp);
#else
return ret_errno(ENOSYS);
#endif
} }
static int get_config_autodev(const char *key, char *retv, int inlen, static int get_config_autodev(const char *key, char *retv, int inlen,