CVS: rdesktop scard.c,1.5,1.6

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17487

Modified Files:
	scard.c 
Log Message:
move response-limitation to a more appropriate place


Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** scard.c	1 Nov 2006 22:46:05 -0000	1.5
--- scard.c	2 Nov 2006 11:09:35 -0000	1.6
***************
*** 1510,1523 ****
  	if (cbRecvLength)
  	{
- 		/* FIXME: handle responses with length > 448 bytes */
- 		if (cbRecvLength > 448)
- 		{
- #ifdef WITH_SCARD_DEBUG
- 			printf("[RECV LEN %d -> %d]\n", (unsigned int) cbRecvLength, 400);
- #endif
- 			cbRecvLength = 448;
- 		}
- 
- 
  		recvBuf = SC_xmalloc(&lcHandle, cbRecvLength);
  		if (!recvBuf)
--- 1510,1513 ----
***************
*** 1599,1602 ****
--- 1589,1603 ----
  			   myPioRecvPci, recvBuf, &myCbRecvLength);
  	cbRecvLength = myCbRecvLength;
+ 
+ 	/* FIXME: handle responses with length > 448 bytes */
+ 	if (cbRecvLength > 448)
+ 	{
+ 		warning("Card response limited from %d to 448 bytes!\n", cbRecvLength);
+ #ifdef WITH_SCARD_DEBUG
+ 		printf("[RECV LEN %d -> %d]\n", (unsigned int) cbRecvLength, 400);
+ #endif
+ 		cbRecvLength = 448;
+ 	}
+ 
  	if (pioRecvPci)
  	{


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642