CVS: rdesktop disk.c, 1.55, 1.56 licence.c, 1.36, 1.37 secure.c, 1.58, 1.59

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

Modified Files:
	disk.c licence.c secure.c 
Log Message:
fix some warnings


Index: disk.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/disk.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** disk.c	22 Sep 2005 00:16:31 -0000	1.55
--- disk.c	2 Jul 2006 13:03:22 -0000	1.56
***************
*** 1017,1021 ****
  							(buf[42] << 24) + (buf[41] << 16) +
  							(buf[40] << 8) + buf[39];
! 						strncpy(info.label, buf + 43, 10);
  						info.label[10] = '\0';
  					}
--- 1017,1021 ----
  							(buf[42] << 24) + (buf[41] << 16) +
  							(buf[40] << 8) + buf[39];
! 						strncpy(info.label, (char*)buf + 43, 10);
  						info.label[10] = '\0';
  					}
***************
*** 1023,1027 ****
  					{
  						read(fd, buf, sizeof(buf));
! 						strncpy(info.label, buf + 41, 32);
  						info.label[32] = '\0';
  						/* info.Serial = (buf[128]<<24)+(buf[127]<<16)+(buf[126]<<8)+buf[125]; */
--- 1023,1027 ----
  					{
  						read(fd, buf, sizeof(buf));
! 						strncpy(info.label, (char*)buf + 41, 32);
  						info.label[32] = '\0';
  						/* info.Serial = (buf[128]<<24)+(buf[127]<<16)+(buf[126]<<8)+buf[125]; */

Index: licence.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/licence.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** licence.c	3 Aug 2005 10:56:16 -0000	1.36
--- licence.c	2 Jul 2006 13:03:22 -0000	1.37
***************
*** 226,230 ****
  licence_process_authreq(STREAM s)
  {
! 	uint8 *in_token, *in_sig;
  	uint8 out_token[LICENCE_TOKEN_SIZE], decrypt_token[LICENCE_TOKEN_SIZE];
  	uint8 hwid[LICENCE_HWID_SIZE], crypt_hwid[LICENCE_HWID_SIZE];
--- 226,230 ----
  licence_process_authreq(STREAM s)
  {
! 	uint8 *in_token = NULL, *in_sig;
  	uint8 out_token[LICENCE_TOKEN_SIZE], decrypt_token[LICENCE_TOKEN_SIZE];
  	uint8 hwid[LICENCE_HWID_SIZE], crypt_hwid[LICENCE_HWID_SIZE];

Index: secure.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/secure.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** secure.c	21 Jun 2006 14:40:02 -0000	1.58
--- secure.c	2 Jul 2006 13:03:22 -0000	1.59
***************
*** 727,731 ****
  sec_process_crypt_info(STREAM s)
  {
! 	uint8 *server_random, *modulus, *exponent;
  	uint8 client_random[SEC_RANDOM_SIZE];
  	uint32 rc4_key_size;
--- 727,731 ----
  sec_process_crypt_info(STREAM s)
  {
! 	uint8 *server_random, *modulus = NULL, *exponent = NULL;
  	uint8 client_random[SEC_RANDOM_SIZE];
  	uint32 rc4_key_size;


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