mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
security: drop the "declare extension security" dix call. Use the
SecurityPolicy configuration file instead.
This commit is contained in:
@@ -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 },
|
||||
|
||||
Reference in New Issue
Block a user