summaryrefslogtreecommitdiff
path: root/src/file
diff options
context:
space:
mode:
authorJohn Turner <jturner.usa@gmail.com>2025-08-21 00:43:49 -0400
committerJohn Turner <jturner.usa@gmail.com>2025-08-21 00:43:49 -0400
commitaa65eb3a2dc4be277cba2e5a00a4470fe9f2b299 (patch)
tree2d56f9a27beceef40a5b6cbcbe9f6d430a47c924 /src/file
parente4789ab9788364aee07e4485e8103820aa862b17 (diff)
downloadselinux-policy-debugging.tar.gz
trying to fix userfiledebugging
Diffstat (limited to 'src/file')
-rw-r--r--src/file/homefile/userhomefile.cil29
-rw-r--r--src/file/userfile.cil6
2 files changed, 20 insertions, 15 deletions
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))))