DEVEL15-windows-afsd-callback-20090312

LICENSE MIT

use cm_HaveCallback() to check for a call back instead of explicit
checks on cbExpires and cbServerp.  cm_HaveCallback takes into account
Freelance mode and offline status.

(cherry picked from commit ef81e9395c171f9dcb8df120991ba65ec1ca5610)

diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c
index 47da75930540e692fe8e3de37af6c8232b971b8e..70538d1b21cfdbb0aa7be7bc1b27470255b8cfae 100644 (file)
--- a/src/WINNT/afsd/cm_callback.c
+++ b/src/WINNT/afsd/cm_callback.c
@@ -190,8 +190,7 @@ void cm_RevokeCallback(struct rx_call *callp, cm_cell_t * cellp, AFSFid *fidp)
              scp->fid.vnode == tfid.vnode &&
              scp->fid.unique == tfid.unique &&
              (cellp == NULL || scp->fid.cell == cellp->cellID) &&
-             scp->cbExpires > 0 && 
-             scp->cbServerp != NULL)
+             cm_HaveCallback(scp))
         {
             cm_HoldSCacheNoLock(scp);
             lock_ReleaseWrite(&cm_scacheLock);