diff --git a/Xext/xace.c b/Xext/xace.c index 3a0a8b0b23..288d07320d 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -111,13 +111,6 @@ int XaceHookScreensaverAccess(ClientPtr client, ScreenPtr screen, Mask access_mo return rec.status; } -int XaceHookAuthAvail(ClientPtr client, XID authId) -{ - XaceAuthAvailRec rec = { client, authId }; - CallCallbacks(&XaceHooks[XACE_AUTH_AVAIL], &rec); - return Success; -} - /* XaceHookIsSet * * Utility function to determine whether there are any callbacks listening on a diff --git a/Xext/xace.h b/Xext/xace.h index 42750c8777..f1d304e61a 100644 --- a/Xext/xace.h +++ b/Xext/xace.h @@ -47,8 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define XACE_SELECTION_ACCESS 10 #define XACE_SCREEN_ACCESS 11 #define XACE_SCREENSAVER_ACCESS 12 -#define XACE_AUTH_AVAIL 13 -#define XACE_NUM_HOOKS 14 +#define XACE_NUM_HOOKS 13 extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS]; @@ -80,7 +79,6 @@ int XaceHookClientAccess(ClientPtr client, ClientPtr target, Mask access_mode); int XaceHookServerAccess(ClientPtr client, Mask access_mode); int XaceHookScreenAccess(ClientPtr client, ScreenPtr screen, Mask access_mode); int XaceHookScreensaverAccess(ClientPtr client, ScreenPtr screen, Mask access_mode); -int XaceHookAuthAvail(ClientPtr client, XID authId); /* Register / unregister a callback for a given hook. */ diff --git a/Xext/xacestr.h b/Xext/xacestr.h index 1aa346e494..85d152b455 100644 --- a/Xext/xacestr.h +++ b/Xext/xacestr.h @@ -110,12 +110,6 @@ typedef struct { int status; } XaceScreenAccessRec; -/* XACE_AUTH_AVAIL */ -typedef struct { - ClientPtr client; - XID authId; -} XaceAuthAvailRec; - /* XACE_AUDIT_BEGIN */ /* XACE_AUDIT_END */ typedef struct { diff --git a/os/connection.c b/os/connection.c index ba1d78a272..afff7d1f8c 100644 --- a/os/connection.c +++ b/os/connection.c @@ -590,8 +590,6 @@ ClientAuthorized(ClientPtr client, XdmcpOpenDisplay(priv->fd); #endif /* XDMCP */ - XaceHookAuthAvail(client, auth_id); - /* At this point, if the client is authorized to change the access control * list, we should getpeername() information, and add the client to * the selfhosts list. It's not really the host machine, but the