From: František Dvořák <valtri@civ.zcu.cz>
Date: Sun, 23 Feb 2014 12:07:24 +0000 (+0100)
Subject: Catch EACCES too in access().
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b5880a4797978443863af6ec85b0e4255a56eeb9;p=dmlite-plugins-vfs.git

Catch EACCES too in access().
---

diff --git a/src/VfsNs.cpp b/src/VfsNs.cpp
index ff3d9b7..3ff977c 100644
--- a/src/VfsNs.cpp
+++ b/src/VfsNs.cpp
@@ -259,28 +259,33 @@ bool VfsCatalog::access(const std::string& path, int mode) throw (DmException)
   ExtendedStat meta;
   mode_t perm;
 
-  if (vfsCheckPermissions(path, S_IREAD))
-    vfsThrow(EACCES, "not enough permissions for '%s'", clientName.c_str());
-
   try {
+    if (vfsCheckPermissions(path, S_IREAD))
+      vfsThrow(EACCES, "not enough permissions for '%s'", clientName.c_str());
+
     meta = this->vfsExtendedStat(path);
 
     perm = 0;
     if (mode & R_OK) perm  = S_IREAD;
     if (mode & W_OK) perm |= S_IWRITE;
     if (mode & X_OK) perm |= S_IEXEC;
+
+    if (checkPermissions(this->secCtx_, meta.acl, meta.stat, perm) != 0) return false;
   } catch (DmException& e) {
-    if (e.code() == ENOENT) {
-      // throw exeption up only if there was not requested test for existence (F_OK)
-      if (mode & F_OK) return false;
-      else throw DmException(DMLITE_NO_SUCH_REPLICA, e.what());
-    } else {
-      throw;
+    switch (e.code()) {
+      case ENOENT:
+        // throw exeption up only if there was not requested test for existence (F_OK)
+        if (mode & F_OK) return false;
+        else throw DmException(DMLITE_NO_SUCH_REPLICA, e.what());
+        break;
+      case EACCES:
+        return false;
+        break;
+      default:
+        throw;
     }
   }
 
-  if (checkPermissions(this->secCtx_, meta.acl, meta.stat, perm) != 0) return false;
-
   if (::access(getLocalPath(path).c_str(), mode) == -1) {
     if (errno == ENOENT) {
       // stat() performed OK, but access() failed with ENOENT