diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-03 10:56:18 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-03 10:56:18 -0400 |
| commit | d445d2f22b5c97fa010370f4ba9cb0555df4a853 (patch) | |
| tree | ee89b8be5dc19197e4c060168ff5147531c6b5ab /mi | |
| parent | e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 (diff) | |
security: drop the "declare extension security" dix call. Use the
SecurityPolicy configuration file instead.
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miinitext.c | 6 |
1 files changed, 1 insertions, 5 deletions
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 }, |