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

XACE: Remove the extension code entirely, XACE is completely static now.

This commit is contained in:
Eamon Walsh 2008-01-25 18:04:10 -05:00 committed by Eamon Walsh
parent 7724c30a75
commit f6a78ee143
4 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Xext/xace.c
View File

@ -24,7 +24,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdarg.h> #include <stdarg.h>
#include "scrnintstr.h" #include "scrnintstr.h"
#include "xacestr.h" #include "xacestr.h"
#include "modinit.h"
CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0}; CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0};
@ -222,14 +221,6 @@ int XaceHook(int hook, ...)
return prv ? *prv : Success; return prv ? *prv : Success;
} }
/* XaceExtensionInit
*
* Initialize the XACE Extension
*/
void XaceExtensionInit(INITARGS)
{
}
/* XaceCensorImage /* XaceCensorImage
* *
* Called after pScreen->GetImage to prevent pieces or trusted windows from * Called after pScreen->GetImage to prevent pieces or trusted windows from

1
Xext/xace.h
View File

@ -22,7 +22,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef XACE #ifdef XACE
#define XACE_EXTENSION_NAME "XAccessControlExtension"
#define XACE_MAJOR_VERSION 2 #define XACE_MAJOR_VERSION 2
#define XACE_MINOR_VERSION 0 #define XACE_MINOR_VERSION 0

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

@ -125,10 +125,6 @@ extern void ShmRegisterFuncs(
ShmFuncsPtr funcs); ShmFuncsPtr funcs);
#endif #endif
#ifdef XACE
extern void XaceExtensionInit(INITARGS);
#endif
#ifdef XSELINUX #ifdef XSELINUX
extern void SELinuxExtensionInit(INITARGS); extern void SELinuxExtensionInit(INITARGS);
#endif #endif

12
mi/miinitext.c
View File

@ -244,9 +244,6 @@ typedef void (*InitExtension)(INITARGS);
#define _XAG_SERVER_ #define _XAG_SERVER_
#include <X11/extensions/Xagstr.h> #include <X11/extensions/Xagstr.h>
#endif #endif
#ifdef XACE
#include "xace.h"
#endif
#ifdef XCSECURITY #ifdef XCSECURITY
#include "securitysrv.h" #include "securitysrv.h"
#include <X11/extensions/securstr.h> #include <X11/extensions/securstr.h>
@ -323,9 +320,6 @@ extern void DbeExtensionInit(INITARGS);
#ifdef XAPPGROUP #ifdef XAPPGROUP
extern void XagExtensionInit(INITARGS); extern void XagExtensionInit(INITARGS);
#endif #endif
#ifdef XACE
extern void XaceExtensionInit(INITARGS);
#endif
#ifdef XCSECURITY #ifdef XCSECURITY
extern void SecurityExtensionInit(INITARGS); extern void SecurityExtensionInit(INITARGS);
#endif #endif
@ -599,9 +593,6 @@ InitExtensions(argc, argv)
#ifdef XAPPGROUP #ifdef XAPPGROUP
if (!noXagExtension) XagExtensionInit(); if (!noXagExtension) XagExtensionInit();
#endif #endif
#ifdef XACE
XaceExtensionInit();
#endif
#ifdef XCSECURITY #ifdef XCSECURITY
if (!noSecurityExtension) SecurityExtensionInit(); if (!noSecurityExtension) SecurityExtensionInit();
#endif #endif
@ -696,9 +687,6 @@ static ExtensionModule staticExtensions[] = {
#ifdef XAPPGROUP #ifdef XAPPGROUP
{ XagExtensionInit, XAGNAME, &noXagExtension, NULL, NULL }, { XagExtensionInit, XAGNAME, &noXagExtension, NULL, NULL },
#endif #endif
#ifdef XACE
{ XaceExtensionInit, XACE_EXTENSION_NAME, NULL, NULL, NULL },
#endif
#ifdef XCSECURITY #ifdef XCSECURITY
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL }, { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
#endif #endif