frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xselinux: don't FatalError on an invalid class mapping, just disable support.

This commit is contained in:
Eamon Walsh 2007-12-28 11:56:54 -05:00 committed by Eamon Walsh
parent f3780ece52
commit f4bc333fc1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Xext/xselinux.c
View File

@ -1376,15 +1376,20 @@ XSELinuxExtensionInit(INITARGS)
/* Setup SELinux stuff */ /* Setup SELinux stuff */
if (!is_selinux_enabled()) { if (!is_selinux_enabled()) {
ErrorF("XSELinux: Extension failed to load: SELinux not enabled\n"); ErrorF("XSELinux: SELinux not enabled, disabling SELinux support.\n");
return; return;
} }
selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback)SELinuxLog); selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback)SELinuxLog);
selinux_set_callback(SELINUX_CB_AUDIT, (union selinux_callback)SELinuxAudit); selinux_set_callback(SELINUX_CB_AUDIT, (union selinux_callback)SELinuxAudit);
if (selinux_set_mapping(map) < 0) if (selinux_set_mapping(map) < 0) {
if (errno == EINVAL) {
ErrorF("XSELinux: Invalid object class mapping, disabling SELinux support.\n");
return;
}
FatalError("XSELinux: Failed to set up security class mapping\n"); FatalError("XSELinux: Failed to set up security class mapping\n");
}
if (avc_open(NULL, 0) < 0) if (avc_open(NULL, 0) < 0)
FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n"); FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n");