Remove LBX code.

3 files changed, 1 insertions, 66 deletions

diff --git a/Xext/xace.c b/Xext/xace.c
index eb9540a8f..29853b38b 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -169,36 +169,6 @@ int XaceHook(int hook, ...)
 	    calldata = &rec;
 	    break;
 	}
-#ifdef LBX
-	case XACE_LBX_EXT_ACCESS: {
-	    XaceLbxExtAccessRec rec = {
-		va_arg(ap, ClientPtr),
-		va_arg(ap, LbxExtensionEntry*),
-		TRUE		/* default allow */
-	    };
-	    calldata = &rec;
-	    prv = &rec.rval;
-	    break;
-	}
-	case XACE_DECLARE_LBX_EXT_SECURE: {
-	    XaceDeclareLbxExtSecureRec rec = {
-		va_arg(ap, LbxExtensionEntry*),
-		va_arg(ap, Bool)
-	    };
-	    calldata = &rec;
-	    break;
-	}
-	case XACE_LBX_PROXY_ACCESS: {
-	    XaceLbxProxyAccessRec rec = {
-		va_arg(ap, ClientPtr),
-		va_arg(ap, XID),
-		TRUE		/* default allow */
-	    };
-	    calldata = &rec;
-	    prv = &rec.rval;
-	    break;
-	}
-#endif
 	default: {
 	    va_end(ap);
 	    return 0;	/* unimplemented hook number */
diff --git a/Xext/xace.h b/Xext/xace.h
index 8c0695641..68f6dd442 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -46,14 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_SITE_POLICY		10
 #define XACE_DECLARE_EXT_SECURE		11
 #define XACE_AUTH_AVAIL			12
-#ifndef LBX
 #define XACE_NUM_HOOKS			13
-#else /* LBX */
-#define XACE_LBX_EXT_ACCESS		13
-#define XACE_DECLARE_LBX_EXT_SECURE	14
-#define XACE_LBX_PROXY_ACCESS		15
-#define XACE_NUM_HOOKS			16
-#endif
 
 extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
 
@@ -64,9 +57,7 @@ extern int XaceHook(
     ... /*appropriate args for hook*/
     ); 
 
-/* Register a callback for a given hook.  Extensions do not
- * need to register themselves with XACERegisterExtension()
- * to do this.
+/* Register a callback for a given hook.
  */
 #define XaceRegisterCallback(hook,callback,data) \
     AddCallback(XaceHooks+(hook), callback, data)
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index d460715f9..a01bf4a2a 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -28,9 +28,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "windowstr.h"
 #include "inputstr.h"
 #include "xace.h"
-#ifdef LBX
-#include "lbxserve.h"  /* for LbxExtensionEntry */
-#endif
 
 /* XACE_CORE_DISPATCH */
 typedef struct {
@@ -115,27 +112,4 @@ typedef struct {
     XID authId;
 } XaceAuthAvailRec;
 
-#ifdef LBX
-/* XACE_LBX_EXT_ACCESS */
-typedef struct {
-    ClientPtr client;
-    LbxExtensionEntry *ext;
-    int rval;
-} XaceLbxExtAccessRec;
-
-/* XACE_DECLARE_LBX_EXT_SECURE */
-typedef struct {
-    LbxExtensionEntry *ext;
-    Bool secure;
-} XaceDeclareLbxExtSecureRec;
-
-/* XACE_LBX_PROXY_ACCESS */
-typedef struct {
-    ClientPtr client;
-    XID authId;
-    int rval;
-} XaceLbxProxyAccessRec;
-
-#endif  /* LBX */
-
 #endif /* _XACESTR_H */