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

xace: Export wrappers around two Xtrans functions used by modules. 

Don't know a better way to do this, since Xtrans isn't a library that
can be linked into modules.
This commit is contained in:
Eamon Walsh 2008-12-18 13:58:35 -05:00
parent 777408914d
commit f87e66486c
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Xext/xace.c
View File

@ -29,6 +29,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "gcstruct.h" #include "gcstruct.h"
#include "xacestr.h" #include "xacestr.h"
#define XSERV_t
#define TRANS_SERVER
#include <X11/Xtrans/Xtrans.h>
#include "../os/osdep.h"
_X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0}; _X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0};
/* Special-cased hook functions. Called by Xserver. /* Special-cased hook functions. Called by Xserver.
@ -339,3 +344,18 @@ XaceCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h,
REGION_UNINIT(pScreen, &imageRegion); REGION_UNINIT(pScreen, &imageRegion);
REGION_UNINIT(pScreen, &censorRegion); REGION_UNINIT(pScreen, &censorRegion);
} /* XaceCensorImage */ } /* XaceCensorImage */
/*
* Xtrans wrappers for use by modules
*/
int XaceGetConnectionNumber(ClientPtr client)
{
XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
return _XSERVTransGetConnectionNumber(ci);
}
int XaceIsLocal(ClientPtr client)
{
XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
return _XSERVTransIsLocal(ci);
}

4
Xext/xace.h
View File

@ -85,6 +85,10 @@ void XaceHookAuditEnd(ClientPtr ptr, int result);
#define XaceDeleteCallback(hook,callback,data) \ #define XaceDeleteCallback(hook,callback,data) \
DeleteCallback(XaceHooks+(hook), callback, data) DeleteCallback(XaceHooks+(hook), callback, data)
/* XTrans wrappers for use by security modules
*/
_X_EXPORT int XaceGetConnectionNumber(ClientPtr ptr);
_X_EXPORT int XaceIsLocal(ClientPtr ptr);
/* From the original Security extension... /* From the original Security extension...
*/ */