diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-18 16:27:54 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-21 21:47:35 +1000 |
commit | 55747d256d759850141e4a9c4dec965616a31dc8 (patch) | |
tree | b9f140d3bbca93f3028cf2340271789fd1d92e6d /Xext/security.c | |
parent | 0b7c6c728c2e2d8433a188315cc591308a89cd85 (diff) |
input: define server-supported protocol versions in one single file.
include/protocol-versions.h specifies each extension version as supported by
the server and sent back on the wire to the client.
This fixes up several issues with the server potentially reporting a higher
version of the protocol if recompiled against a newer version of the
protocol.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: RĂ©mi Cardona <remi@gentoo.org>
Acked-by: Julien Cristau <jcristau@debian.org>
Diffstat (limited to 'Xext/security.c')
-rw-r--r-- | Xext/security.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Xext/security.c b/Xext/security.c index 42eb9f01d..2cd0e1774 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -39,6 +39,7 @@ in this Software without prior written authorization from The Open Group. #include "securitysrv.h" #include <X11/extensions/securproto.h> #include "modinit.h" +#include "protocol-versions.h" /* Extension stuff */ static int SecurityErrorBase; /* first Security error number */ @@ -371,8 +372,8 @@ ProcSecurityQueryVersion( rep.type = X_Reply; rep.sequenceNumber = client->sequence; rep.length = 0; - rep.majorVersion = SECURITY_MAJOR_VERSION; - rep.minorVersion = SECURITY_MINOR_VERSION; + rep.majorVersion = SERVER_SECURITY_MAJOR_VERSION; + rep.minorVersion = SERVER_SECURITY_MINOR_VERSION; if(client->swapped) { char n; |