DEVEL15-windows-rdrtimeout-20070727

RDRtimeout is seconds.  need to convert to milliseconds for comparison

(cherry picked from commit 0ba1a6275755e7df19cab1cf20fb1b7aaf176c61)

diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index e3061aff639138d6b86d069c98a2fbc3cadbdb3a..88f75dba6331f0e1edae830ff44e53ad0d174f33 100644 (file)
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -4389,7 +4389,7 @@ long smb_ReceiveCoreSearchDir(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou
                                                       scp->bulkStatProgress)) {
                     /* Don't bulk stat if risking timeout */
                     int now = GetTickCount();
-                    if (now - req.startTime > RDRtimeout) {
+                    if (now - req.startTime > RDRtimeout * 1000) {
                         scp->bulkStatProgress = thyper;
                         scp->flags &= ~CM_SCACHEFLAG_BULKSTATTING;
                         dsp->flags &= ~SMB_DIRSEARCH_BULKST;

diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c
index 2680215b6c4d6100573503841e8dd0dfb553bbdb..eba779addb45dbb76bee3755d18054b7a52aea44 100644 (file)
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -4978,7 +4978,7 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t
                     LargeIntegerGreaterThanOrEqualTo(thyper, scp->bulkStatProgress)) {
                     /* Don't bulk stat if risking timeout */
                     DWORD now = GetTickCount();
-                    if (now - req.startTime > RDRtimeout) {
+                    if (now - req.startTime > RDRtimeout * 1000) {
                         scp->bulkStatProgress = thyper;
                         scp->flags &= ~CM_SCACHEFLAG_BULKSTATTING;
                         dsp->flags &= ~SMB_DIRSEARCH_BULKST;