Add xace headers to the SDK when enabled and export the XaceHooks symbol

to modules.

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

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.
  */

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,

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"