diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-05 20:15:41 +0000 |
|---|---|---|
| committer | Alan Coopersmith <alanc@alf.(none)> | 2006-06-19 16:35:03 -0700 |
| commit | 8d9ccc90a54c786ca4ba5620ab0a965e3f3bc8ea (patch) | |
| tree | 79afaaabcb26cffaa480566df55c62f04813f338 /mi | |
| parent | 9f2793551f335e5fb08990fc8bb9e05e0ffb68d5 (diff) | |
Add XACE extension
(partially cherry picked from 8d4f21ab53c44ca48501d6211ea6db0c0b8af916 commit)
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miinitext.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 091ac6b26..2a57a8958 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -243,6 +243,9 @@ typedef void (*InitExtension)(INITARGS); #define _XAG_SERVER_ #include <X11/extensions/Xagstr.h> #endif +#ifdef XACE +#include "xace.h" +#endif #ifdef XCSECURITY #define _SECURITY_SERVER #include <X11/extensions/securstr.h> @@ -313,7 +316,11 @@ extern void DbeExtensionInit(INITARGS); #ifdef XAPPGROUP extern void XagExtensionInit(INITARGS); #endif +#ifdef XACE +extern void XaceExtensionInit(INITARGS); +#endif #ifdef XCSECURITY +extern void SecurityExtensionSetup(INITARGS); extern void SecurityExtensionInit(INITARGS); #endif #ifdef XPRINT @@ -524,6 +531,9 @@ InitExtensions(argc, argv) int argc; char *argv[]; { +#ifdef XCSECURITY + SecurityExtensionSetup(); +#endif #ifdef PANORAMIX # if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX) if (!noPanoramiXExtension) PanoramiXExtensionInit(); @@ -586,6 +596,9 @@ InitExtensions(argc, argv) #ifdef XAPPGROUP if (!noXagExtension) XagExtensionInit(); #endif +#ifdef XACE + XaceExtensionInit(); +#endif #ifdef XCSECURITY if (!noSecurityExtension) SecurityExtensionInit(); #endif @@ -688,8 +701,11 @@ 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 }, + { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, SecurityExtensionSetup, NULL }, #endif #ifdef XPRINT { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL }, |