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

Add SELinux extension to the module/extension loader.

This commit is contained in:
Eamon Walsh 2006-09-08 15:17:01 -04:00 committed by Eamon Walsh
parent 28e80cd65b
commit a7f4bbea87
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xfree86/dixmods/extmod/modinit.h
View File

@ -129,6 +129,11 @@ extern void ShmRegisterFuncs(
extern void XaceExtensionInit(INITARGS); extern void XaceExtensionInit(INITARGS);
#endif #endif
#ifdef XSELINUX
extern void XSELinuxExtensionSetup(INITARGS);
extern void XSELinuxExtensionInit(INITARGS);
#endif
#if 1 #if 1
extern void SecurityExtensionSetup(INITARGS); extern void SecurityExtensionSetup(INITARGS);
extern void SecurityExtensionInit(INITARGS); extern void SecurityExtensionInit(INITARGS);

16
mi/miinitext.c
View File

@ -248,6 +248,9 @@ typedef void (*InitExtension)(INITARGS);
#include "securitysrv.h" #include "securitysrv.h"
#include <X11/extensions/securstr.h> #include <X11/extensions/securstr.h>
#endif #endif
#ifdef XSELINUX
#include "xselinux.h"
#endif
#ifdef PANORAMIX #ifdef PANORAMIX
#include <X11/extensions/panoramiXproto.h> #include <X11/extensions/panoramiXproto.h>
#endif #endif
@ -321,6 +324,10 @@ extern void XaceExtensionInit(INITARGS);
extern void SecurityExtensionSetup(INITARGS); extern void SecurityExtensionSetup(INITARGS);
extern void SecurityExtensionInit(INITARGS); extern void SecurityExtensionInit(INITARGS);
#endif #endif
#ifdef XSELINUX
extern void XSELinuxExtensionSetup(INITARGS);
extern void XSELinuxExtensionInit(INITARGS);
#endif
#ifdef XPRINT #ifdef XPRINT
extern void XpExtensionInit(INITARGS); extern void XpExtensionInit(INITARGS);
#endif #endif
@ -532,6 +539,9 @@ InitExtensions(argc, argv)
#ifdef XCSECURITY #ifdef XCSECURITY
SecurityExtensionSetup(); SecurityExtensionSetup();
#endif #endif
#ifdef XSELINUX
XSELinuxExtensionSetup();
#endif
#ifdef PANORAMIX #ifdef PANORAMIX
# if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX) # if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
if (!noPanoramiXExtension) PanoramiXExtensionInit(); if (!noPanoramiXExtension) PanoramiXExtensionInit();
@ -600,6 +610,9 @@ InitExtensions(argc, argv)
#ifdef XCSECURITY #ifdef XCSECURITY
if (!noSecurityExtension) SecurityExtensionInit(); if (!noSecurityExtension) SecurityExtensionInit();
#endif #endif
#ifdef XSELINUX
XSELinuxExtensionInit();
#endif
#ifdef XPRINT #ifdef XPRINT
XpExtensionInit(); /* server-specific extension, cannot be disabled */ XpExtensionInit(); /* server-specific extension, cannot be disabled */
#endif #endif
@ -705,6 +718,9 @@ static ExtensionModule staticExtensions[] = {
#ifdef XCSECURITY #ifdef XCSECURITY
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, SecurityExtensionSetup, NULL }, { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, SecurityExtensionSetup, NULL },
#endif #endif
#ifdef XSELINUX
{ XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, XSELinuxExtensionSetup, NULL },
#endif
#ifdef XPRINT #ifdef XPRINT
{ XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL }, { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
#endif #endif