From d445d2f22b5c97fa010370f4ba9cb0555df4a853 Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Fri, 3 Aug 2007 10:56:18 -0400 Subject: security: drop the "declare extension security" dix call. Use the SecurityPolicy configuration file instead. --- mi/miinitext.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'mi') diff --git a/mi/miinitext.c b/mi/miinitext.c index f14254051..964ef3e0e 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -321,7 +321,6 @@ extern void XagExtensionInit(INITARGS); extern void XaceExtensionInit(INITARGS); #endif #ifdef XCSECURITY -extern void SecurityExtensionSetup(INITARGS); extern void SecurityExtensionInit(INITARGS); #endif #ifdef XSELINUX @@ -538,9 +537,6 @@ InitExtensions(argc, argv) int argc; char *argv[]; { -#ifdef XCSECURITY - SecurityExtensionSetup(); -#endif #ifdef XSELINUX XSELinuxExtensionSetup(); #endif @@ -719,7 +715,7 @@ static ExtensionModule staticExtensions[] = { { XaceExtensionInit, XACE_EXTENSION_NAME, NULL, NULL, NULL }, #endif #ifdef XCSECURITY - { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, SecurityExtensionSetup, NULL }, + { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL }, #endif #ifdef XSELINUX { XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, XSELinuxExtensionSetup, NULL }, -- cgit v1.2.3