xserver: Branch 'master'

[GitLab Mirror]

 os/rpcauth.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8dc82a13a91f76b432f0e77abea6bde7c9abc68c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 21 11:26:59 2024 +0100

    os: rpc: fix type mismatch
    
    fix warning:
    
    > ../os/rpcauth.c:159:16: warning: result of comparison of constant -1 with expression of type 'XID' (aka 'unsigned int') is always false [-Wtautological-constant-out-of-range-compare]
    >     if (rpc_id == ~0L)
    >         ~~~~~~ ^  ~~~
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1431>

diff --git a/os/rpcauth.c b/os/rpcauth.c
index 9209021e0..c531a54e8 100644
--- a/os/rpcauth.c
+++ b/os/rpcauth.c
@@ -156,7 +156,7 @@ SecureRPCCheck(unsigned short data_length, const char *data,
 _X_HIDDEN void
 SecureRPCInit(void)
 {
-    if (rpc_id == ~0L)
+    if (rpc_id == (XID) ~0L)
         AddAuthorization(9, "SUN-DES-1", 0, (char *) 0);
 }