hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-04 22:36:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dcdc_rework

Browse source 
Conflicts:

	Xext/xevie.c
	dix/dispatch.c
This commit is contained in:
Peter Hutterer 2008-04-07 07:56:41 +09:30
commit fd06e8f8c1
182 changed files with 5741 additions and 4820 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/xfree86/dixmods/Makefile.am
View file

@ -26,6 +26,10 @@ if MFB
MFBMOD = libmfb.la
endif
if RECORD
RECORDMOD = librecord.la
endif
module_LTLIBRARIES = $(AFBMOD) \
$(CFBMOD) \
libfb.la \
@ -34,7 +38,7 @@ module_LTLIBRARIES = $(AFBMOD) \
libshadow.la
extsmoduledir = $(moduledir)/extensions
extsmodule_LTLIBRARIES = librecord.la \
extsmodule_LTLIBRARIES = $(RECORDMOD) \
$(DBEMOD) \
$(GLXMODS) \
$(XTRAPMOD)

23
hw/xfree86/dixmods/extmod/modinit.c
View file

@ -42,7 +42,7 @@ static ExtensionModule extensionModules[] = {
{
SELinuxExtensionInit,
SELINUX_EXTENSION_NAME,
NULL,
&noSELinuxExtension,
NULL,
NULL
},
@ -258,6 +258,27 @@ extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
}
}
}
#ifdef XSELINUX
if (! strcmp(SELINUX_EXTENSION_NAME, extensionModules[i].name)) {
pointer o;
selinuxEnforcingState = SELINUX_MODE_DEFAULT;
if ((o = xf86FindOption(opts, "SELinux mode disabled"))) {
xf86MarkOptionUsed(o);
selinuxEnforcingState = SELINUX_MODE_DISABLED;
}
if ((o = xf86FindOption(opts, "SELinux mode permissive"))) {
xf86MarkOptionUsed(o);
selinuxEnforcingState = SELINUX_MODE_PERMISSIVE;
}
if ((o = xf86FindOption(opts, "SELinux mode enforcing"))) {
xf86MarkOptionUsed(o);
selinuxEnforcingState = SELINUX_MODE_ENFORCING;
}
}
#endif
LoadExtension(&extensionModules[i], FALSE);
}
/* Need a non-NULL return */