diff options
| author | John Turner <jturner.usa@gmail.com> | 2025-08-21 23:10:31 -0400 |
|---|---|---|
| committer | John Turner <jturner.usa@gmail.com> | 2025-08-21 23:12:01 -0400 |
| commit | d5d6e960bde4acdb5086a60873870c4ca22d0776 (patch) | |
| tree | 04b50f9580960fcef1c2668c6aebf942b822f6de /src | |
| parent | c18214d214c525119c042ae13d719931160b089d (diff) | |
| download | selinux-policy-d5d6e960bde4acdb5086a60873870c4ca22d0776.tar.gz | |
remove loader block from being in .file
Diffstat (limited to 'src')
| -rw-r--r-- | src/file/ldfile.cil | 31 | ||||
| -rw-r--r-- | src/subj/common.cil | 8 |
2 files changed, 19 insertions, 20 deletions
diff --git a/src/file/ldfile.cil b/src/file/ldfile.cil index 3dc8feb..60adb23 100644 --- a/src/file/ldfile.cil +++ b/src/file/ldfile.cil @@ -1,18 +1,17 @@ -(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 loader + (block conf + (blockinherit .file.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" dir file_context) + (filecon "/var/cache/ldconfig/.*" file file_context))) diff --git a/src/subj/common.cil b/src/subj/common.cil index 4780a91..15911bc 100644 --- a/src/subj/common.cil +++ b/src/subj/common.cil @@ -41,10 +41,10 @@ (call .sys.read_fs_files (typeattr)) ;; loader - (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)) + (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)) ;; use libraries (call .lib.mapexecute_file_files (typeattr)) |