From f1baed733fa5b3a7a88c375f1d76b182a76369e1 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Thu, 27 Oct 2005 18:32:16 +0000 Subject: [PATCH] fix some /opt regexes --- refpolicy/policy/modules/system/corecommands.fc | 6 +++--- refpolicy/policy/modules/system/files.fc | 2 +- refpolicy/policy/modules/system/libraries.fc | 4 ++-- refpolicy/policy/modules/system/miscfiles.fc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/refpolicy/policy/modules/system/corecommands.fc b/refpolicy/policy/modules/system/corecommands.fc index f8eac623b..d12dedf4e 100644 --- a/refpolicy/policy/modules/system/corecommands.fc +++ b/refpolicy/policy/modules/system/corecommands.fc @@ -54,11 +54,11 @@ ifdef(`targeted_policy',` # # /opt # -/opt/(.*)?/bin(/.*)? gen_context(system_u:object_r:bin_t,s0) +/opt(/.*)?/bin(/.*)? gen_context(system_u:object_r:bin_t,s0) -/opt/(.*)?/libexec(/.*)? gen_context(system_u:object_r:bin_t,s0) +/opt(/.*)?/libexec(/.*)? gen_context(system_u:object_r:bin_t,s0) -/opt/(.*)?/sbin(/.*)? gen_context(system_u:object_r:sbin_t,s0) +/opt(/.*)?/sbin(/.*)? gen_context(system_u:object_r:sbin_t,s0) # # /usr diff --git a/refpolicy/policy/modules/system/files.fc b/refpolicy/policy/modules/system/files.fc index bddc00da7..37e01228f 100644 --- a/refpolicy/policy/modules/system/files.fc +++ b/refpolicy/policy/modules/system/files.fc @@ -102,7 +102,7 @@ HOME_ROOT/lost\+found/.* <> # /opt(/.*)? gen_context(system_u:object_r:usr_t,s0) -/opt/(.*)?/var/lib(64)?(/.*)? gen_context(system_u:object_r:var_lib_t,s0) +/opt(/.*)?/var/lib(64)?(/.*)? gen_context(system_u:object_r:var_lib_t,s0) # # /proc diff --git a/refpolicy/policy/modules/system/libraries.fc b/refpolicy/policy/modules/system/libraries.fc index 1b8b2fb87..1b2454a9c 100644 --- a/refpolicy/policy/modules/system/libraries.fc +++ b/refpolicy/policy/modules/system/libraries.fc @@ -17,8 +17,8 @@ # # /opt # -/opt/(.*)?/lib(64)?(/.*)? gen_context(system_u:object_r:lib_t,s0) -/opt/(.*)?/lib(64)?/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) +/opt(/.*)?/lib(64)?(/.*)? gen_context(system_u:object_r:lib_t,s0) +/opt(/.*)?/lib(64)?/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) # # /sbin diff --git a/refpolicy/policy/modules/system/miscfiles.fc b/refpolicy/policy/modules/system/miscfiles.fc index 92c7e5c35..29b8dd1a8 100644 --- a/refpolicy/policy/modules/system/miscfiles.fc +++ b/refpolicy/policy/modules/system/miscfiles.fc @@ -7,7 +7,7 @@ # # /opt # -/opt/(.*)?/man(/.*)? gen_context(system_u:object_r:man_t,s0) +/opt(/.*)?/man(/.*)? gen_context(system_u:object_r:man_t,s0) # # /srv