c391d58b0b
Thu Jul 08 2004 Dan Walsh <dwalsh@redhat.com> 1.15.1-1 - Update to latest from NSA - Add fix to only get old path if file_context file exists in old location
18 lines
587 B
Diff
18 lines
587 B
Diff
--- libselinux-1.15.1/src/selinux_config.c.rhat 2004-07-08 09:13:49.000000000 -0400
|
|
+++ libselinux-1.15.1/src/selinux_config.c 2004-07-08 09:18:47.110934853 -0400
|
|
@@ -91,9 +91,11 @@
|
|
FILE *cfg;
|
|
if (selinux_policyroot) return;
|
|
if (access(SELINUXDIR, F_OK) != 0) {
|
|
- selinux_policyroot = SECURITYDIR;
|
|
- active_file_paths = compat_file_paths;
|
|
- return;
|
|
+ if (access(SECURITYDIR "/selinux/file_contexts", F_OK) == 0) {
|
|
+ selinux_policyroot = SECURITYDIR;
|
|
+ active_file_paths = compat_file_paths;
|
|
+ return;
|
|
+ }
|
|
}
|
|
cfg = fopen(SELINUXCONFIG,"r");
|
|
if (cfg) {
|