[Pcsclite-cvs-commit] r5224 - /trunk/PCSC/src/winscard_svc.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Sep  2 13:54:56 2010
New Revision: 5224

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5224
Log:
ContextThread(): check that the procotol major.minor is the same for the
daemon and lib. If not just fail. We are not backward compatible.

Modified:
    trunk/PCSC/src/winscard_svc.c

Modified: trunk/PCSC/src/winscard_svc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.c?rev=5224&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.c (original)
+++ trunk/PCSC/src/winscard_svc.c Thu Sep  2 13:54:56 2010
@@ -321,23 +321,19 @@
 				threadContext->protocol_major = veStr.major;
 				threadContext->protocol_minor = veStr.minor;
 
-				Log3(PCSC_LOG_DEBUG,
-						"Client is protocol version %d:%d",
+				Log3(PCSC_LOG_DEBUG, "Client is protocol version %d:%d",
+					veStr.major, veStr.minor);
+
+				veStr.rv = SCARD_S_SUCCESS;
+
+				/* client and server use different protocol */
+				if ((veStr.major != PROTOCOL_VERSION_MAJOR)
+					|| (veStr.minor != PROTOCOL_VERSION_MINOR))
+				{
+					Log3(PCSC_LOG_CRITICAL, "Client protocol is %d:%d",
 						veStr.major, veStr.minor);
-
-				veStr.rv = SCARD_S_SUCCESS;
-
-				/* client is newer than server */
-				if ((veStr.major > PROTOCOL_VERSION_MAJOR)
-						|| (veStr.major == PROTOCOL_VERSION_MAJOR
-							&& veStr.minor > PROTOCOL_VERSION_MINOR))
-				{
-					Log3(PCSC_LOG_CRITICAL,
-							"Client protocol is too new %d:%d",
-							veStr.major, veStr.minor);
-					Log3(PCSC_LOG_CRITICAL,
-							"Server protocol is %d:%d",
-							PROTOCOL_VERSION_MAJOR, PROTOCOL_VERSION_MINOR);
+					Log3(PCSC_LOG_CRITICAL, "Server protocol is %d:%d",
+						PROTOCOL_VERSION_MAJOR, PROTOCOL_VERSION_MINOR);
 					veStr.rv = SCARD_E_NO_SERVICE;
 				}