--- sourceforge.net/trunk/rdesktop/rdpdr.c	2007/01/08 04:47:06	1372
+++ sourceforge.net/trunk/rdesktop/rdpdr.c	2008/07/11 03:51:23	1475
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 8 -*-
    rdesktop: A Remote Desktop Protocol client.
-   Copyright (C) Matthew Chapman 1999-2007
+   Copyright (C) Matthew Chapman 1999-2008
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -429,7 +429,7 @@
 
 			if (length && (length / 2) < 256)
 			{
-				rdp_in_unistr(s, filename, length);
+				rdp_in_unistr(s, filename, sizeof(filename), length);
 				convert_to_unix_filename(filename);
 			}
 			else
@@ -622,7 +622,8 @@
 					in_uint8s(s, 0x17);
 					if (length && length < 2 * 255)
 					{
-						rdp_in_unistr(s, filename, length);
+						rdp_in_unistr(s, filename, sizeof(filename),
+							      length);
 						convert_to_unix_filename(filename);
 					}
 					else
@@ -645,8 +646,6 @@
 
 					in_uint32_le(s, info_level);	/* notify mask */
 
-					g_notify_stamp = True;
-
 					status = disk_create_notify(file, info_level);
 					result = 0;
 
@@ -686,18 +685,12 @@
 			out.data = out.p = buffer;
 			out.size = sizeof(buffer);
 
-			DEBUG_SCARD(("[SMART-CARD TRACE]\n"));
-			DEBUG_SCARD(("device 0x%.8x\n", device));
-			DEBUG_SCARD(("file   0x%.8x\n", file));
-			DEBUG_SCARD(("id     0x%.8x\n", id));
 #ifdef WITH_SCARD
 			scardSetInfo(device, id, bytes_out + 0x14);
 #endif
 			status = fns->device_control(file, request, s, &out);
 			result = buffer_len = out.p - out.data;
 
-			DEBUG_SCARD(("[SMART-CARD TRACE] OUT 0x%.8x\n", status));
-
 			/* Serial SERIAL_WAIT_ON_MASK */
 			if (status == RD_STATUS_PENDING)
 			{