[Pcsclite-cvs-commit] r5145 - /trunk/PCSC/src/pcscdaemon.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Aug 16 10:03:40 2010
New Revision: 5145

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5145
Log:
Do not allow restricting defaults values of --max-thread,
--max-card-handle-per-thread or --max-card-handle-per-reader when
restricted

Modified:
    trunk/PCSC/src/pcscdaemon.c

Modified: trunk/PCSC/src/pcscdaemon.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscdaemon.c?rev=5145&op=diff
==============================================================================
--- trunk/PCSC/src/pcscdaemon.c (original)
+++ trunk/PCSC/src/pcscdaemon.c Mon Aug 16 10:03:40 2010
@@ -270,18 +270,24 @@
 
 			case 't':
 				customMaxThreadCounter = optarg ? atoi(optarg) : 0; 
+				if (limited_rights && (customMaxThreadCounter < PCSC_MAX_CONTEXT_THREADS))
+					customMaxThreadCounter = PCSC_MAX_CONTEXT_THREADS;
 				Log2(PCSC_LOG_INFO, "setting customMaxThreadCounter to: %d",
 					customMaxThreadCounter);
 				break;
 
 			case 'r':
 				customMaxReaderHandles = optarg ? atoi(optarg) : 0; 
+				if (limited_rights && (customMaxReaderHandles < PCSC_MAX_READER_HANDLES))
+					customMaxReaderHandles = PCSC_MAX_READER_HANDLES;
 				Log2(PCSC_LOG_INFO, "setting customMaxReaderHandles to: %d",
 					customMaxReaderHandles);
 				break;
 
 			case 's':
 				customMaxThreadCardHandles = optarg ? atoi(optarg) : 0; 
+				if (limited_rights && (customMaxThreadCardHandles < PCSC_MAX_CONTEXT_CARD_HANDLES))
+					customMaxThreadCardHandles = PCSC_MAX_CONTEXT_CARD_HANDLES;
 				Log2(PCSC_LOG_INFO, "setting customMaxThreadCardHandles to: %d",
 					customMaxThreadCardHandles);
 				break;