diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/Xext/xace.h | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/Xext/xace.h')
| -rw-r--r-- | xorg-server/Xext/xace.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/xorg-server/Xext/xace.h b/xorg-server/Xext/xace.h index bd69bca98..6029d87d8 100644 --- a/xorg-server/Xext/xace.h +++ b/xorg-server/Xext/xace.h @@ -1,6 +1,6 @@ /************************************************************ -Author: Eamon Walsh <ewalsh@epoch.ncsc.mil> +Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that @@ -56,23 +56,24 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define XACE_AUDIT_END 16 #define XACE_NUM_HOOKS 17 -extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS]; +extern _X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS]; /* Entry point for hook functions. Called by Xserver. + * Required by libdbe and libextmod */ -extern int XaceHook( +extern _X_EXPORT int XaceHook( int /*hook*/, ... /*appropriate args for hook*/ ); /* Special-cased hook functions */ -extern int XaceHookDispatch(ClientPtr ptr, int major); -extern int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, - PropertyPtr *ppProp, Mask access_mode); -extern int XaceHookSelectionAccess(ClientPtr ptr, +extern _X_EXPORT int XaceHookDispatch(ClientPtr ptr, int major); +extern _X_EXPORT int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, + PropertyPtr *ppProp, Mask access_mode); +extern _X_EXPORT int XaceHookSelectionAccess(ClientPtr ptr, Selection **ppSel, Mask access_mode); -extern void XaceHookAuditEnd(ClientPtr ptr, int result); +extern _X_EXPORT void XaceHookAuditEnd(ClientPtr ptr, int result); /* Register a callback for a given hook. */ @@ -84,11 +85,15 @@ extern void XaceHookAuditEnd(ClientPtr ptr, int result); #define XaceDeleteCallback(hook,callback,data) \ DeleteCallback(XaceHooks+(hook), callback, data) +/* XTrans wrappers for use by security modules + */ +extern _X_EXPORT int XaceGetConnectionNumber(ClientPtr ptr); +extern _X_EXPORT int XaceIsLocal(ClientPtr ptr); /* From the original Security extension... */ -extern void XaceCensorImage( +extern _X_EXPORT void XaceCensorImage( ClientPtr client, RegionPtr pVisibleRegion, long widthBytesLine, |