From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 7 Feb 2007 08:12:27 +0000 (+0000)
Subject: windows-merge-eaccess-20070207
X-Git-Tag: BP-openafs-windows-kdfs-ifs~820
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e9fb99c770101de103df0a2ff7ba364159b81f80;p=packages%2Fo%2Fopenafs.git

windows-merge-eaccess-20070207


when merging status info that has an errorCode of EACCESS set,
merge the garbage we received.

When checking the access to the object return EACCESS if the
stat cache object has the EACCESS flag set.  This will be cleared
the next time a BulkStatus succeeds.
---

diff --git a/src/WINNT/afsd/cm_access.c b/src/WINNT/afsd/cm_access.c
index ba747a808..d9d141a9a 100644
--- a/src/WINNT/afsd/cm_access.c
+++ b/src/WINNT/afsd/cm_access.c
@@ -38,7 +38,12 @@ int cm_HaveAccessRights(struct cm_scache *scp, struct cm_user *userp, afs_uint32
     cm_fid_t tfid;
     int didLock;
     long trights;
-	
+
+    if (scp->flags & CM_SCACHEFLAG_EACCESS) {
+    	*outRightsp = aclScp->anyAccess;
+	return CM_ERROR_NOACCESS;
+    }
+
     didLock = 0;
     if (scp->fileType == CM_SCACHETYPE_DIRECTORY) {
         aclScp = scp;
diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index c643fc41b..8d32b4e72 100644
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -1313,7 +1313,6 @@ void cm_MergeStatus(cm_scache_t *scp, AFSFetchStatus *statusp, AFSVolSync *volp,
     if (statusp->errorCode != 0) {	
 	scp->flags |= CM_SCACHEFLAG_EACCESS;
 	osi_Log2(afsd_logp, "Merge, Failure scp %x code 0x%x", scp, statusp->errorCode);
-	return;
     } else {
 	scp->flags &= ~CM_SCACHEFLAG_EACCESS;
     }