xselinux: Move the extension to extmod instead of being built-in.
This commit is contained in:
parent
f6a78ee143
commit
e915a26397
|
@ -76,7 +76,7 @@ endif
|
||||||
# requires X-ACE extension
|
# requires X-ACE extension
|
||||||
XSELINUX_SRCS = xselinux.c xselinux.h
|
XSELINUX_SRCS = xselinux.c xselinux.h
|
||||||
if XSELINUX
|
if XSELINUX
|
||||||
BUILTIN_SRCS += $(XSELINUX_SRCS)
|
MODULE_SRCS += $(XSELINUX_SRCS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Security extension: multi-level security to protect clients from each other
|
# Security extension: multi-level security to protect clients from each other
|
||||||
|
|
|
@ -38,6 +38,15 @@ static MODULESETUPPROTO(extmodSetup);
|
||||||
* Array describing extensions to be initialized
|
* Array describing extensions to be initialized
|
||||||
*/
|
*/
|
||||||
static ExtensionModule extensionModules[] = {
|
static ExtensionModule extensionModules[] = {
|
||||||
|
#ifdef XSELINUX
|
||||||
|
{
|
||||||
|
SELinuxExtensionInit,
|
||||||
|
SELINUX_EXTENSION_NAME,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL
|
||||||
|
},
|
||||||
|
#endif
|
||||||
#ifdef SHAPE
|
#ifdef SHAPE
|
||||||
{
|
{
|
||||||
ShapeExtensionInit,
|
ShapeExtensionInit,
|
||||||
|
|
|
@ -127,6 +127,7 @@ extern void ShmRegisterFuncs(
|
||||||
|
|
||||||
#ifdef XSELINUX
|
#ifdef XSELINUX
|
||||||
extern void SELinuxExtensionInit(INITARGS);
|
extern void SELinuxExtensionInit(INITARGS);
|
||||||
|
#include "xselinux.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if 1
|
#if 1
|
||||||
|
|
|
@ -690,9 +690,6 @@ static ExtensionModule staticExtensions[] = {
|
||||||
#ifdef XCSECURITY
|
#ifdef XCSECURITY
|
||||||
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
|
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
|
||||||
#endif
|
#endif
|
||||||
#ifdef XSELINUX
|
|
||||||
{ SELinuxExtensionInit, SELINUX_EXTENSION_NAME, NULL, NULL, NULL },
|
|
||||||
#endif
|
|
||||||
#ifdef XPRINT
|
#ifdef XPRINT
|
||||||
{ XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
|
{ XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user