summaryrefslogtreecommitdiff
path: root/record
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-18 16:27:54 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-21 21:47:35 +1000
commit55747d256d759850141e4a9c4dec965616a31dc8 (patch)
treeb9f140d3bbca93f3028cf2340271789fd1d92e6d /record
parent0b7c6c728c2e2d8433a188315cc591308a89cd85 (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 'record')
-rw-r--r--record/record.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/record/record.c b/record/record.c
index 84a96188a..b94b4ae18 100644
--- a/record/record.c
+++ b/record/record.c
@@ -53,6 +53,8 @@ and Jim Haggerty of Metheus.
#include "cursor.h"
#endif
+#include "protocol-versions.h"
+
static RESTYPE RTContext; /* internal resource type for Record contexts */
static int RecordErrorBase; /* first Record error number */
@@ -1866,8 +1868,8 @@ ProcRecordQueryVersion(ClientPtr client)
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.length = 0;
- rep.majorVersion = RECORD_MAJOR_VERSION;
- rep.minorVersion = RECORD_MINOR_VERSION;
+ rep.majorVersion = SERVER_RECORD_MAJOR_VERSION;
+ rep.minorVersion = SERVER_RECORD_MINOR_VERSION;
if(client->swapped)
{
swaps(&rep.sequenceNumber, n);