xserver: Branch 'master'

[GitLab Mirror]

 os/access.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 7dfe1c56b0f27e4fc738d0aa61e677fc3d2249ed
Author: Matthieu Herrb <matthieu at herrb.eu>
Date:   Sat Feb 17 16:24:40 2024 +0100

    OpenBSD build fix: struct ucred is struct sockpeercred there

diff --git a/os/access.c b/os/access.c
index 9fec1b731..3b0662105 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1179,7 +1179,11 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredRec ** lccp)
     ucred_t *peercred = NULL;
     const gid_t *gids;
 #elif defined(SO_PEERCRED)
+#ifndef __OpenBSD__
     struct ucred peercred;
+#else
+    struct sockpeercred peercred;
+#endif
     socklen_t so_len = sizeof(peercred);
 #elif defined(LOCAL_PEERCRED) && defined(HAVE_XUCRED_CR_PID)
     struct xucred peercred;