diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-12-18 12:35:57 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-12-18 12:39:08 -0500 |
| commit | 777408914dbf395e9969e3f34720286e6f740369 (patch) | |
| tree | 75e17887324b0778c84c3d54ad9d8a8d20719cf7 | |
| parent | 9e4ef3cfe5ee178c266edd64a8edd767827aa0d7 (diff) | |
Add xace headers to the SDK when enabled and export the XaceHooks symbol
to modules.
| -rw-r--r-- | Xext/Makefile.am | 3 | ||||
| -rw-r--r-- | Xext/xace.c | 2 | ||||
| -rw-r--r-- | Xext/xace.h | 14 | ||||
| -rwxr-xr-x | hw/xfree86/loader/sdksyms.sh | 1 |
4 files changed, 12 insertions, 8 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index f3b765230..ac45f955a 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -73,6 +73,9 @@ endif XACE_SRCS = xace.c xace.h xacestr.h if XACE BUILTIN_SRCS += $(XACE_SRCS) +if XORG +sdk_HEADERS += xace.h xacestr.h +endif endif # SELinux extension: provides SELinux policy support for X objects diff --git a/Xext/xace.c b/Xext/xace.c index 8a8f8c61d..c7583197d 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "gcstruct.h" #include "xacestr.h" -CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0}; +_X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0}; /* Special-cased hook functions. Called by Xserver. */ diff --git a/Xext/xace.h b/Xext/xace.h index 1aaab0333..542b1574a 100644 --- a/Xext/xace.h +++ b/Xext/xace.h @@ -61,19 +61,19 @@ extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS]; /* Entry point for hook functions. Called by Xserver. * Required by libdbe and libextmod */ -extern _X_EXPORT int XaceHook( +_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, +int XaceHookDispatch(ClientPtr ptr, int major); +int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, + PropertyPtr *ppProp, Mask access_mode); +int XaceHookSelectionAccess(ClientPtr ptr, Selection **ppSel, Mask access_mode); -extern void XaceHookAuditEnd(ClientPtr ptr, int result); +void XaceHookAuditEnd(ClientPtr ptr, int result); /* Register a callback for a given hook. */ @@ -89,7 +89,7 @@ extern void XaceHookAuditEnd(ClientPtr ptr, int result); /* From the original Security extension... */ -extern void XaceCensorImage( +void XaceCensorImage( ClientPtr client, RegionPtr pVisibleRegion, long widthBytesLine, diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh index e6c15cca4..55f7206f2 100755 --- a/hw/xfree86/loader/sdksyms.sh +++ b/hw/xfree86/loader/sdksyms.sh @@ -311,6 +311,7 @@ cat > sdksyms.c << EOF #include "validate.h" #include "window.h" #include "windowstr.h" +#include "xace.h" #include "xkbfile.h" #include "xkbsrv.h" #include "xkbstr.h" |