From da58522087d48dc8d6a4d4019144178c963b854b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 16 Jul 2025 22:50:04 +0200 Subject: [PATCH] Xace: drop XaceIsLocal() Just a dumb wrapper to ClientIsLocal() - we can use this one directly. Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/xace.c | 6 ------ Xext/xace.h | 1 - Xext/xselinux_hooks.c | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Xext/xace.c b/Xext/xace.c index 051aef4760..bc45e62355 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -275,12 +275,6 @@ XaceGetConnectionNumber(ClientPtr client) return GetClientFd(client); } -int -XaceIsLocal(ClientPtr client) -{ - return ClientIsLocal(client); -} - Bool XaceRegisterCallback(int hook, CallbackProcPtr callback, void *data) { diff --git a/Xext/xace.h b/Xext/xace.h index db1dd750ef..ed56a6c058 100644 --- a/Xext/xace.h +++ b/Xext/xace.h @@ -100,7 +100,6 @@ int XaceHookKeyAvail(xEventPtr ev, DeviceIntPtr dev, int count); /* XTrans wrappers for use by security modules */ int XaceGetConnectionNumber(ClientPtr ptr); -int XaceIsLocal(ClientPtr ptr); /* From the original Security extension... */ diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c index 8835558f3b..4a608d80df 100644 --- a/Xext/xselinux_hooks.c +++ b/Xext/xselinux_hooks.c @@ -130,7 +130,7 @@ SELinuxLabelClient(ClientPtr client) } /* For local clients, try and determine the executable name */ - if (XaceIsLocal(client)) { + if (ClientIsLocal(client)) { /* Get cached command name if CLIENTIDS is enabled. */ const char *cmdname = GetClientCmdName(client); Bool cached = (cmdname != NULL);