diff options
| -rw-r--r-- | src/agent/weechat.cil | 4 | ||||
| -rw-r--r-- | src/file/homefile/userhomefile.cil | 29 | ||||
| -rw-r--r-- | src/file/userfile.cil | 6 |
3 files changed, 22 insertions, 17 deletions
diff --git a/src/agent/weechat.cil b/src/agent/weechat.cil index dca6591..31901cf 100644 --- a/src/agent/weechat.cil +++ b/src/agent/weechat.cil @@ -44,8 +44,8 @@ ;; access config stuff (call .home.search_file_dirs (subj)) - (call .user.home.search_file_dirs (subj)) - (call .user.home.create_file_dirs (subj)) + (call .userhome.search_file_dirs (subj)) + (call .userhome.create_file_dirs (subj)) (call home.search_file_dirs (subj)) (call home.readwrite_file_files (subj)) diff --git a/src/file/homefile/userhomefile.cil b/src/file/homefile/userhomefile.cil index de8a882..5b2b755 100644 --- a/src/file/homefile/userhomefile.cil +++ b/src/file/homefile/userhomefile.cil @@ -1,5 +1,5 @@ (in file.unconfined - (call .user.home.home_file_type_transition_file (typeattr dir "*"))) + (call .userhome.home_file_type_transition_file (typeattr dir "*"))) (in file.home (block user @@ -8,8 +8,8 @@ (typeattribute typeattr) - (call file.home.type (typeattr)) - (call file.user.type (typeattr)) + (call .file.home.type (typeattr)) + (call .file.user.type (typeattr)) (block base_template (blockabstract base_template) @@ -18,13 +18,16 @@ (block template (blockabstract template) - (blockinherit .file.user.template)))) - -(in user - (block home - (macro home_file_type_transition_file ((type ARG1) (class ARG2) (name ARG3)) - (call .home.file_type_transition (ARG1 file ARG2 ARG3))) - - (blockinherit file.home.user.template) - (filecon "HOME_DIR" dir file_context) - (filecon "HOME_DIR/.*" any file_context))) + (blockinherit .file.home.user.base_template) + (blockinherit .file.macro_template_files) + (blockinherit .file.macro_template_dirs)))) + + +(block userhome + (macro home_file_type_transition_file ((type ARG1) (class ARG2) (name ARG3)) + (call .home.file_type_transition (ARG1 file ARG2 ARG3))) + + (blockinherit .file.home.user.template) + + (filecon "HOME_DIR" dir file_context) + (filecon "HOME_DIR/.*" any file_context)) diff --git a/src/file/userfile.cil b/src/file/userfile.cil index 7ca2150..2c3c2c8 100644 --- a/src/file/userfile.cil +++ b/src/file/userfile.cil @@ -20,7 +20,7 @@ (typeattribute typeattr) - (call file.type (typeattr)) + (call .file.type (typeattr)) (block base_template (blockabstract base_template) @@ -29,4 +29,6 @@ (block template (blockabstract template) - (blockinherit .file.template)))) + (Blockinherit file.user.base_template) + (blockinherit file.macro_template_files) + (blockinherit file.macro_template_dirs)))) |