diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-03-28 14:01:34 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2008-03-28 14:14:23 -0400 |
| commit | b5f98fcea2024c67e598947782913982072cf4fb (patch) | |
| tree | f0a1b1321cc41ef9f10abada7b12b5777effeab3 /mi/miinitext.c | |
| parent | 415e49b940bba2d08870db410ebb47d2add5d836 (diff) | |
XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
Patch by Joe Nall.
The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
Diffstat (limited to 'mi/miinitext.c')
| -rw-r--r-- | mi/miinitext.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 3c55eebb3..cc4c15c9d 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -215,6 +215,9 @@ extern Bool noXInputExtension; #ifdef XIDLE extern Bool noXIdleExtension; #endif +#ifdef XSELINUX +extern Bool noSELinuxExtension; +#endif #ifdef XV extern Bool noXvExtension; #endif @@ -488,6 +491,9 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef XKB { "XKEYBOARD", &noXkbExtension }, #endif +#ifdef XSELINUX + { "SELinux", &noSELinuxExtension }, +#endif { "XTEST", &noTestExtensions }, #ifdef XV { "XVideo", &noXvExtension }, @@ -597,7 +603,7 @@ InitExtensions(argc, argv) if (!noSecurityExtension) SecurityExtensionInit(); #endif #ifdef XSELINUX - SELinuxExtensionInit(); + if (!noSELinuxExtension) SELinuxExtensionInit(); #endif #ifdef XPRINT XpExtensionInit(); /* server-specific extension, cannot be disabled */ |