frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove LBX code.

This commit is contained in:
Eamon Walsh 2006-08-03 14:26:06 -04:00 committed by Eamon Walsh
parent 96e45626c4
commit 45c229f526
3 changed files with 1 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Xext/xace.c
View File

@ -169,36 +169,6 @@ int XaceHook(int hook, ...)
calldata = &rec; calldata = &rec;
break; 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: { default: {
va_end(ap); va_end(ap);
return 0; /* unimplemented hook number */ return 0; /* unimplemented hook number */

11
Xext/xace.h
View File

@ -46,14 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define XACE_SITE_POLICY 10 #define XACE_SITE_POLICY 10
#define XACE_DECLARE_EXT_SECURE 11 #define XACE_DECLARE_EXT_SECURE 11
#define XACE_AUTH_AVAIL 12 #define XACE_AUTH_AVAIL 12
#ifndef LBX
#define XACE_NUM_HOOKS 13 #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]; extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
@ -64,9 +57,7 @@ extern int XaceHook(
... /*appropriate args for hook*/ ... /*appropriate args for hook*/
); );
/* Register a callback for a given hook. Extensions do not /* Register a callback for a given hook.
* need to register themselves with XACERegisterExtension()
* to do this.
*/ */
#define XaceRegisterCallback(hook,callback,data) \ #define XaceRegisterCallback(hook,callback,data) \
AddCallback(XaceHooks+(hook), callback, data) AddCallback(XaceHooks+(hook), callback, data)

26
Xext/xacestr.h
View File

@ -28,9 +28,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "windowstr.h" #include "windowstr.h"
#include "inputstr.h" #include "inputstr.h"
#include "xace.h" #include "xace.h"
#ifdef LBX
#include "lbxserve.h" /* for LbxExtensionEntry */
#endif
/* XACE_CORE_DISPATCH */ /* XACE_CORE_DISPATCH */
typedef struct { typedef struct {
@ -115,27 +112,4 @@ typedef struct {
XID authId; XID authId;
} XaceAuthAvailRec; } 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 */ #endif /* _XACESTR_H */