From abe0e6b7bca7fe02c4b08cc621f7a97dfcd82b1b Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 3 Sep 2011 18:25:10 -0400 Subject: [PATCH] Windows: conditionalize cm_Analyze timeLeft on SMB or RDR Restrict timeLeft in cm_Analyze() to SMB constraints only when SMB mode is in use. Change-Id: Iff37b90c1532fe9aa7d57567f4ff4e5e6877cb65 Reviewed-on: http://gerrit.openafs.org/5341 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsd/cm_conn.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c index f6bce49382..1461775232 100644 --- a/src/WINNT/afsd/cm_conn.c +++ b/src/WINNT/afsd/cm_conn.c @@ -285,7 +285,10 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp, /* timeleft - get it from reqp the same way as cm_ConnByMServers does */ timeUsed = (GetTickCount() - reqp->startTime) / 1000; - timeLeft = HardDeadtimeout - timeUsed; + if ( reqp->flags & CM_REQ_SOURCE_SMB ) + timeLeft = HardDeadtimeout - timeUsed; + else + timeLeft = 0x0FFFFFFF; /* get a pointer to the cell */ if (errorCode) {