Revert "Fix afs_AccessOK for dropbox case"

[openafs.git] / src / afs / VNOPS / afs_vnop_access.c

diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c
index 13c309c..0a31ac8 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_access.c
+++ b/src/afs/VNOPS/afs_vnop_access.c
@@ -191,11 +191,11 @@ afs_AccessOK(struct vcache *avc, afs_int32 arights, struct vrequest *areq,
 #if defined(AFS_SUN5_ENV) || (defined(AFS_SGI_ENV) && !defined(AFS_SGI65_ENV))
 int
 afs_access(OSI_VC_DECL(avc), register afs_int32 amode, int flags,
-          struct AFS_UCRED *acred)
+          afs_ucred_t *acred)
 #else
 int
 afs_access(OSI_VC_DECL(avc), register afs_int32 amode,
-          struct AFS_UCRED *acred)
+          afs_ucred_t *acred)
 #endif
 {
     register afs_int32 code;
@@ -295,18 +295,6 @@ afs_access(OSI_VC_DECL(avc), register afs_int32 amode,
            if (amode & VEXEC) {
                code = afs_AccessOK(avc, PRSFS_READ, &treq, CHECK_MODE_BITS);
                if (code) {
-#ifdef AFS_OSF_ENV
-                   /*
-                    * The nfs server in read operations for non-owner of a file
-                    * will also check the access with the VEXEC (along with VREAD)
-                    * because for them exec is the same as read over the net because of
-                    * demand loading. But this means if the mode bit is '-rw' the call
-                    * will fail below; so for this particular case where both modes are
-                    * specified (only in rfs_read so far) and from the xlator requests
-                    * we return succes.
-                    */
-                   if (!((amode & VREAD) && AFS_NFSXLATORREQ(acred)))
-#endif
                        if ((avc->f.m.Mode & 0100) == 0)
                            code = 0;
                } else if (avc->f.m.Mode & 0100)
@@ -351,7 +339,7 @@ afs_access(OSI_VC_DECL(avc), register afs_int32 amode,
  */
 int
 afs_getRights(OSI_VC_DECL(avc), register afs_int32 arights,
-             struct AFS_UCRED *acred)
+             afs_ucred_t *acred)
 {
     register afs_int32 code;
     struct vrequest treq;