diff --git a/Xext/xace.c b/Xext/xace.c
index 02abc5696..0e05877d2 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -129,13 +129,19 @@ 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;
+}
+
 /* Entry point for hook functions.  Called by Xserver.
  */
 int
 XaceHook(int hook, ...)
 {
     union {
-        XaceAuthAvailRec auth;
         XaceKeyAvailRec key;
     } u;
     int *prv = NULL;            /* points to return value from callback */
@@ -152,11 +158,6 @@ XaceHook(int hook, ...)
      * sets calldata directly to a single argument (with no return result)
      */
     switch (hook) {
-    case XACE_AUTH_AVAIL:
-        u.auth.client = va_arg(ap, ClientPtr);
-        u.auth.authId = va_arg(ap, XID);
-
-        break;
     case XACE_KEY_AVAIL:
         u.key.event = va_arg(ap, xEventPtr);
         u.key.keybd = va_arg(ap, DeviceIntPtr);
diff --git a/Xext/xace.h b/Xext/xace.h
index c2cbc3f20..c1e838ee1 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -93,6 +93,7 @@ int XaceHookExtAccess(ClientPtr client, ExtensionEntry *ext);
 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 a callback for a given hook.
diff --git a/os/connection.c b/os/connection.c
index 9047d7fc7..425e692cf 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -579,7 +579,7 @@ ClientAuthorized(ClientPtr client,
     XdmcpOpenDisplay(priv->fd);
 #endif                          /* XDMCP */
 
-    XaceHook(XACE_AUTH_AVAIL, client, auth_id);
+    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