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 /composite | |
| 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 'composite')
| -rw-r--r-- | composite/compext.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/composite/compext.c b/composite/compext.c index 56b4f2784..976d00242 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -53,9 +53,7 @@ #include "compint.h" #include "xace.h" - -#define SERVER_COMPOSITE_MAJOR 0 -#define SERVER_COMPOSITE_MINOR 4 +#include "protocol-versions.h" static CARD8 CompositeReqCode; static int CompositeClientPrivateKeyIndex; @@ -124,12 +122,12 @@ ProcCompositeQueryVersion (ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR) { + if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR_VERSION) { rep.majorVersion = stuff->majorVersion; rep.minorVersion = stuff->minorVersion; } else { - rep.majorVersion = SERVER_COMPOSITE_MAJOR; - rep.minorVersion = SERVER_COMPOSITE_MINOR; + rep.majorVersion = SERVER_COMPOSITE_MAJOR_VERSION; + rep.minorVersion = SERVER_COMPOSITE_MINOR_VERSION; } pCompositeClient->major_version = rep.majorVersion; pCompositeClient->minor_version = rep.minorVersion; |