diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-01-25 18:04:10 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2008-01-25 18:04:10 -0500 |
| commit | f6a78ee143e3a3ad69538adf2b9675d724468ffa (patch) | |
| tree | 92265dfaaddec2bff1fa0f9223528945c34a2608 | |
| parent | 7724c30a751c653ca3e2e8a6752af27bc37de3f0 (diff) | |
XACE: Remove the extension code entirely, XACE is completely static now.
| -rw-r--r-- | Xext/xace.c | 9 | ||||
| -rw-r--r-- | Xext/xace.h | 1 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.h | 4 | ||||
| -rw-r--r-- | mi/miinitext.c | 12 |
4 files changed, 0 insertions, 26 deletions
diff --git a/Xext/xace.c b/Xext/xace.c index 0b3baf6b1..0470e44dd 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -24,7 +24,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdarg.h> #include "scrnintstr.h" #include "xacestr.h" -#include "modinit.h" CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0}; @@ -222,14 +221,6 @@ int XaceHook(int hook, ...) return prv ? *prv : Success; } -/* XaceExtensionInit - * - * Initialize the XACE Extension - */ -void XaceExtensionInit(INITARGS) -{ -} - /* XaceCensorImage * * Called after pScreen->GetImage to prevent pieces or trusted windows from diff --git a/Xext/xace.h b/Xext/xace.h index a8fac98e2..4100ba16e 100644 --- a/Xext/xace.h +++ b/Xext/xace.h @@ -22,7 +22,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef XACE -#define XACE_EXTENSION_NAME "XAccessControlExtension" #define XACE_MAJOR_VERSION 2 #define XACE_MINOR_VERSION 0 diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 99d714c4f..116cb2ef7 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -125,10 +125,6 @@ extern void ShmRegisterFuncs( ShmFuncsPtr funcs); #endif -#ifdef XACE -extern void XaceExtensionInit(INITARGS); -#endif - #ifdef XSELINUX extern void SELinuxExtensionInit(INITARGS); #endif diff --git a/mi/miinitext.c b/mi/miinitext.c index b14690756..30cbc7a25 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -244,9 +244,6 @@ typedef void (*InitExtension)(INITARGS); #define _XAG_SERVER_ #include <X11/extensions/Xagstr.h> #endif -#ifdef XACE -#include "xace.h" -#endif #ifdef XCSECURITY #include "securitysrv.h" #include <X11/extensions/securstr.h> @@ -323,9 +320,6 @@ extern void DbeExtensionInit(INITARGS); #ifdef XAPPGROUP extern void XagExtensionInit(INITARGS); #endif -#ifdef XACE -extern void XaceExtensionInit(INITARGS); -#endif #ifdef XCSECURITY extern void SecurityExtensionInit(INITARGS); #endif @@ -599,9 +593,6 @@ InitExtensions(argc, argv) #ifdef XAPPGROUP if (!noXagExtension) XagExtensionInit(); #endif -#ifdef XACE - XaceExtensionInit(); -#endif #ifdef XCSECURITY if (!noSecurityExtension) SecurityExtensionInit(); #endif @@ -696,9 +687,6 @@ static ExtensionModule staticExtensions[] = { #ifdef XAPPGROUP { XagExtensionInit, XAGNAME, &noXagExtension, NULL, NULL }, #endif -#ifdef XACE - { XaceExtensionInit, XACE_EXTENSION_NAME, NULL, NULL, NULL }, -#endif #ifdef XCSECURITY { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL }, #endif |