SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac: also rename use_{smack,selinux,apparmor}() calls so that they share the new mac_{smack,selinux,apparmor}_xyz() convention

Browse Source
This commit is contained in:
Lennart Poettering
2014-10-23 17:34:30 +02:00
parent cc56fafeeb
commit 6baa7db008
18 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execute.c
+2 -2
View File
@@ -1669,7 +1669,7 @@ static int exec_child(ExecCommand *command,
#endif
#ifdef HAVE_SELINUX
if (use_selinux()) {
if (mac_selinux_use()) {
if (context->selinux_context) {
err = setexeccon(context->selinux_context);
if (err < 0 && !context->selinux_context_ignore) {
@@ -1697,7 +1697,7 @@ static int exec_child(ExecCommand *command,
#endif
#ifdef HAVE_APPARMOR
if (context->apparmor_profile && use_apparmor()) {
if (context->apparmor_profile && mac_apparmor_use()) {
err = aa_change_onexec(context->apparmor_profile);
if (err < 0 && !context->apparmor_profile_ignore) {
*error = EXIT_APPARMOR_PROFILE;