setfiles fails to relabel if selinux not enabled
Setfiles now checks the capabilities on the mounted file systems for 'seclabel' (see setfiles/setfiles.c:723:exclude_non_seclabel_mounts) on newer kernels (>=2.6.30 see setfiles.c:734). However the 'seclabel' feature is not available if selinux is not enabled. The result is that setfiles silently fails to relabel any filesystems. The patch below removes the check for seclabel if selinux is disabled. As an alternative maybe seclabel should be available even if selinux is disabled? It seems that whether a fs supports security labels is independent of selinux being enabled. Signed-off-by: Joshua Brindle <method@manicmethod.com>
This commit is contained in:
parent
96f592422a
commit
71178d5669
1 changed files with 2 additions and 0 deletions
|
@ -750,6 +750,8 @@ static void exclude_non_seclabel_mounts()
|
|||
/* Check to see if the kernel supports seclabel */
|
||||
if (uname(&uts) == 0 && strverscmp(uts.release, "2.6.30") < 0)
|
||||
return;
|
||||
if (is_selinux_enabled() <= 0)
|
||||
return;
|
||||
|
||||
fp = fopen("/proc/mounts", "r");
|
||||
if (!fp)
|
||||
|
|
Loading…
Reference in a new issue