From 8bbf497e22be060cfdf1f09604b35848011a1a90 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 19 Aug 2025 17:50:54 -0700
Subject: [PATCH] Xace: provide definitions of new hook functions when xace is
 disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Building with -Dxace=false was generating many failures of the form:

../dix/cursor.c: In function ‘AllocARGBCursor’:
../dix/cursor.c:281:10: error: implicit declaration of function
 ‘XaceHookResourceAccess’; did you mean ‘XaceHookPropertyAccess’?
 [-Werror=implicit-function-declaration]
  281 |     rc = XaceHookResourceAccess(client, cid, X11_RESTYPE_CURSOR,
      |          ^~~~~~~~~~~~~~~~~~~~~~
      |          XaceHookPropertyAccess

Fixes: ae3c57333 ("xace: typesafe hook function for XACE_RESOURCE_ACCESS")
Fixes: 9524ffee8 ("xace: typesafe hook function for XACE_DEVICE_ACCESS")
Fixes: 67e468c8b ("xace: typesafe hook function for XACE_SEND_ACCESS")
Fixes: 3dfe00d5e ("xace: typesafe hook function for XACE_RECEIVE_ACCESS")
Fixes: 922b7685d ("xace: typesafe hook function for XACE_CLIENT_ACCESS")
Fixes: 0f6bb23bc ("xace: typesafe hook function for XACE_EXT_ACCESS")
Fixes: 47d6c3ad7 ("xace: typesafe hook function for XACE_SERVER_ACCESS")
Fixes: 51d8bcfc0 ("xace: typesafe hook function for XACE_SCREEN_ACCESS")
Fixes: 305f2d59d ("xace: typesafe hook function for XACE_SCREENSAVER_ACCESS")
Fixes: 591d95c79 ("xace: typesafe hook function for XACE_AUTH_AVAIL")
Fixes: facdaae4e ("xace: typesafe hook function for XACE_KEY_AVAIL")

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2056>
---
 Xext/xace.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Xext/xace.h b/Xext/xace.h
index 481110a1c..ad3dac4f8 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -134,12 +134,34 @@ void XaceCensorImage(ClientPtr client,
 #define XaceHookDispatch(args...) Success
 #define XaceHookPropertyAccess(args...) Success
 #define XaceHookSelectionAccess(args...) Success
+#define XaceHookResourceAccess(args...) Success
+#define XaceHookDeviceAccess(args...) Success
+#define XaceHookSendAccess(args...) Success
+#define XaceHookReceiveAccess(args...) Success
+#define XaceHookClientAccess(args...) Success
+#define XaceHookExtAccess(args...) Success
+#define XaceHookServerAccess(args...) Success
+#define XaceHookScreenAccess(args...) Success
+#define XaceHookScreensaverAccess(args...) Success
+#define XaceHookAuthAvail(args...) Success
+#define XaceHookKeyAvail(args...) Success
 #define XaceCensorImage(args...) { ; }
 #else
 #define XaceHookIsSet(...) 0
 #define XaceHookDispatch(...) Success
 #define XaceHookPropertyAccess(...) Success
 #define XaceHookSelectionAccess(...) Success
+#define XaceHookResourceAccess(...) Success
+#define XaceHookDeviceAccess(...) Success
+#define XaceHookSendAccess(...) Success
+#define XaceHookReceiveAccess(...) Success
+#define XaceHookClientAccess(...) Success
+#define XaceHookExtAccess(...) Success
+#define XaceHookServerAccess(...) Success
+#define XaceHookScreenAccess(...) Success
+#define XaceHookScreensaverAccess(...) Success
+#define XaceHookAuthAvail(...) Success
+#define XaceHookKeyAvail(...) Success
 #define XaceCensorImage(...) { ; }
 #endif