diff options
| -rw-r--r-- | src/agent/weechat.cil | 8 | ||||
| -rw-r--r-- | src/file/runfile/userrunfile.cil | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/agent/weechat.cil b/src/agent/weechat.cil index 6afa28d..4fd8a64 100644 --- a/src/agent/weechat.cil +++ b/src/agent/weechat.cil @@ -67,9 +67,9 @@ ;; access /run/user (call .run.search_file_dirs (subj)) (call .runuser.search_file_dirs (subj)) - (call .userrun.search_file_dirs (subj)) - (call .userrun.create_file_dirs (subj)) - (call .userrun.addname_file_dirs (subj)) + (call .user.run.search_file_dirs (subj)) + (call .user.run.create_file_dirs (subj)) + (call .user.run.addname_file_dirs (subj)) ;; access /run/user/${UID}/weechat (call .agent.weechat.run.search_file_dirs (subj)) @@ -94,7 +94,7 @@ (block run (macro file_type_transition_file ((type ARG1) (class ARG2) (name ARG3)) - (call .userrun.file_type_transition (ARG1 file ARG2 ARG3))) + (call .user.run.file_type_transition (ARG1 file ARG2 ARG3))) (blockinherit .file.user.run.template) diff --git a/src/file/runfile/userrunfile.cil b/src/file/runfile/userrunfile.cil index 9dc65f9..a7b28cc 100644 --- a/src/file/runfile/userrunfile.cil +++ b/src/file/runfile/userrunfile.cil @@ -20,13 +20,14 @@ (blockinherit .file.macro_template_dirs) (blockinherit .file.macro_template_sock_files)))) -(block userrun - (macro file_type_transition_file ((type ARG1) (name ARG2)) - (call .runuser.file_type_transition (ARG1 file dir ARG2))) - - (blockinherit .file.user.run.template) - (filecon "/run/user/%{USERID}" dir file_context) - (filecon "/run/user/%{USERID}/.*" any file_context)) +(in user + (block run + (macro file_type_transition_file ((type ARG1) (name ARG2)) + (call .runuser.file_type_transition (ARG1 file dir ARG2))) + + (blockinherit .file.user.run.template) + (filecon "/run/user/%{USERID}" dir file_context) + (filecon "/run/user/%{USERID}/.*" any file_context))) (in file.unconfined - (call .userrun.file_type_transition_file (typeattr "*"))) + (call .user.run.file_type_transition_file (typeattr "*"))) |