STABLE14-windows-fetchstatus-20061003

Don't call cm_GetCallback without checking the current callback status
with cm_HaveCallback first

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

undo this incorrect change.  don't test for existence of a callback
when we want to force a FetchStatus to obtain per-user ACL info

(cherry picked from commit 665a125335c4844d35fa6510a38083602ef7fdbc)

diff --git a/src/WINNT/afsd/cm_access.c b/src/WINNT/afsd/cm_access.c
index 1cff06472fe755bbc9f1f81d2481315f3ccbbc79..6676e40459dcd71307efef8f3ddd5d2cf367f737 100644 (file)
--- a/src/WINNT/afsd/cm_access.c
+++ b/src/WINNT/afsd/cm_access.c
@@ -149,10 +149,9 @@ long cm_GetAccessRights(struct cm_scache *scp, struct cm_user *up,
             lock_ObtainMutex(&scp->mx);
             return code;
         }       
-                
         osi_Log1(afsd_logp, "GetAccess parent scp %x user %x", aclScp, up);
-        lock_ObtainMutex(&aclScp->mx);
-       code = cm_GetCallback(aclScp, up, reqp, 1);
+       lock_ObtainMutex(&aclScp->mx);
+       code = cm_GetCallback(aclScp, up, reqp, 1);
        lock_ReleaseMutex(&aclScp->mx);
         cm_ReleaseSCache(aclScp);
         lock_ObtainMutex(&scp->mx);