container.conf: Fix option ordering in config_jump_table

Currently lxc.selinux.context.keyring is placed after lxc.selinux.context in config_jump_table. This entails that if lxc.selinux.context.keyring is specified, lxc.selinux.context will be matched to that option. This commit places the lxc.selinux.context.keyring before lxc.selinux.context Signed-off-by: Maximilian Blenk <Maximilian.Blenk@bmw.de>

container.conf: Fix option ordering in config_jump_table
9aee23ad · Maximilian Blenk · 52ab03ac · 9aee23ad
Commit 9aee23ad authored Feb 05, 2020 by Maximilian Blenk
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

confile.c src/lxc/confile.c +1 -1

No files found.
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -235,8 +235,8 @@ static struct lxc_config_t config_jump_table[] = {
 	{ "lxc.seccomp.notify.cookie",     set_config_seccomp_notify_cookie,       get_config_seccomp_notify_cookie,       clr_config_seccomp_notify_cookie,     },
 	{ "lxc.seccomp.notify.proxy",      set_config_seccomp_notify_proxy,        get_config_seccomp_notify_proxy,        clr_config_seccomp_notify_proxy,      },
 	{ "lxc.seccomp.profile",           set_config_seccomp_profile,             get_config_seccomp_profile,             clr_config_seccomp_profile,           },
-	{ "lxc.selinux.context",           set_config_selinux_context,             get_config_selinux_context,             clr_config_selinux_context,           },
 	{ "lxc.selinux.context.keyring",   set_config_selinux_context_keyring,     get_config_selinux_context_keyring,     clr_config_selinux_context_keyring    },
+	{ "lxc.selinux.context",           set_config_selinux_context,             get_config_selinux_context,             clr_config_selinux_context,           },
 	{ "lxc.signal.halt",               set_config_signal_halt,                 get_config_signal_halt,                 clr_config_signal_halt,               },
 	{ "lxc.signal.reboot",             set_config_signal_reboot,               get_config_signal_reboot,               clr_config_signal_reboot,             },
 	{ "lxc.signal.stop",               set_config_signal_stop,                 get_config_signal_stop,                 clr_config_signal_stop,               },