diff options
| author | John Turner <jturner.usa@gmail.com> | 2025-08-18 17:47:48 -0400 |
|---|---|---|
| committer | John Turner <jturner.usa@gmail.com> | 2025-08-18 17:47:48 -0400 |
| commit | 7b161d7683543172887e5c7a3cb33aa3bf8b1cda (patch) | |
| tree | da76ec63497962071df3423efc0dcb3dc1037531 | |
| parent | 10a077ce6a50afdeb187aff8f8372e869663b90b (diff) | |
| download | selinux-policy-7b161d7683543172887e5c7a3cb33aa3bf8b1cda.tar.gz | |
move loader block into file
| -rw-r--r-- | src/file/ldfile.cil | 31 | ||||
| -rw-r--r-- | src/subj/common.cil | 8 |
2 files changed, 20 insertions, 19 deletions
diff --git a/src/file/ldfile.cil b/src/file/ldfile.cil index d706b58..3dc8feb 100644 --- a/src/file/ldfile.cil +++ b/src/file/ldfile.cil @@ -1,17 +1,18 @@ -(block loader - (block conf - (blockinherit file.conf.template) - (filecon "/etc/ld.so.conf" file file_context) - (filecon "/etc/ld.so.conf.d" dir file_context) - (filecon "/etc/ld.so.conf.d/.*" file file_context) - (filecon "/etc/ls.so.cache" file file_context) - (filecon "/etc/ld.so.d" dir file_context)) +(in file + (block loader + (block conf + (blockinherit file.conf.template) + (filecon "/etc/ld.so.conf" file file_context) + (filecon "/etc/ld.so.conf.d" dir file_context) + (filecon "/etc/ld.so.conf.d/.*" file file_context) + (filecon "/etc/ls.so.cache" file file_context) + (filecon "/etc/ld.so.d" dir file_context)) - (block exec - (blockinherit file.exec.template) - (filecon "/usr/bin/ld.so" file file_context)) + (block exec + (blockinherit file.exec.template) + (filecon "/usr/bin/ld.so" file file_context)) - (block cache - (blockinherit file.cache.template) - (filecon "/var/cache/ldconfig" file file_context) - (filecon "/var/cache/ldconfig/.*" file file_context))) + (block cache + (blockinherit file.cache.template) + (filecon "/var/cache/ldconfig" file file_context) + (filecon "/var/cache/ldconfig/.*" file file_context)))) diff --git a/src/subj/common.cil b/src/subj/common.cil index 8f8da38..d9a1287 100644 --- a/src/subj/common.cil +++ b/src/subj/common.cil @@ -37,10 +37,10 @@ (call .proc.search_fs_dirs (typeattr)) ;; loader - (call .loader.conf.read_file_files (typeattr)) - (call .loader.exec.mapexecute_file_files (typeattr)) - (call .loader.cache.search_file_dirs (typeattr)) - (call .loader.cache.read_file_files (typeattr)) + (call .file.loader.conf.read_file_files (typeattr)) + (call .file.loader.exec.mapexecute_file_files (typeattr)) + (call .file.loader.cache.search_file_dirs (typeattr)) + (call .file.loader.cache.read_file_files (typeattr)) ;; use libraries (call .lib.mapexecute_file_files (typeattr)) |