From 0580a054a44af37b9c6cefe09b009b3d0efce0db Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 16 Jul 2025 22:55:10 +0200
Subject: [PATCH] Xace: drop XaceGetConnectionNumber()

It's just a wrapper around GetClientFd() - we can use this one directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/xace.c           | 9 ---------
 Xext/xace.h           | 4 ----
 Xext/xselinux_hooks.c | 2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index bc45e6235..92b972405 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -266,15 +266,6 @@ XaceCensorImage(ClientPtr client,
     RegionUninit(&censorRegion);
 }                               /* XaceCensorImage */
 
-/*
- * Xtrans wrappers for use by modules
- */
-int
-XaceGetConnectionNumber(ClientPtr client)
-{
-    return GetClientFd(client);
-}
-
 Bool
 XaceRegisterCallback(int hook, CallbackProcPtr callback, void *data)
 {
diff --git a/Xext/xace.h b/Xext/xace.h
index ed56a6c05..5ad11fbfb 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -97,10 +97,6 @@ int XaceHookKeyAvail(xEventPtr ev, DeviceIntPtr dev, int count);
 
 /* Register / unregister a callback for a given hook. */
 
-/* XTrans wrappers for use by security modules
- */
-int XaceGetConnectionNumber(ClientPtr ptr);
-
 /* From the original Security extension...
  */
 
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index 4a608d80d..7b0fc9289 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -115,7 +115,7 @@ SELinuxDoCheck(SELinuxSubjectRec * subj, SELinuxObjectRec * obj,
 static void
 SELinuxLabelClient(ClientPtr client)
 {
-    int fd = XaceGetConnectionNumber(client);
+    int fd = GetClientFd(client);
     SELinuxSubjectRec *subj;
     SELinuxObjectRec *obj;
     char *ctx;