Unverified Commit 4eb2224b authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

Remove unused defines regarding ACCESS and LOOKUP 

CHECK_ACCESS didn't make any sense since internally we don't support uid/gid

DO_LOOKUP were not used at all
parent 545b68c9

include/global/configure.hpp

+0 −6
Original line number Diff line number Diff line
@@ -18,12 +18,6 @@ 
#define MDATA_USE_LINK_CNT false

#define MDATA_USE_BLOCKS false



// should permissions be checked when access() is called or discarded (disabled by default)

//#define CHECK_ACCESS

// If access permissions should be checked while opening a file (disabled by default)

//#define CHECK_ACCESS_DURING_OPEN

// If disabled, a file or directory is always presumed to be there (even if it is not). No check is executed (enabled by default)

#define DO_LOOKUP

/*

 * Zero buffer before read. This is relevant if sparse files are used.

 * If buffer is not zeroed, sparse regions contain invalid data.

src/client/adafs_functions.cpp

+0 −15
Original line number Diff line number Diff line
@@ -68,21 +68,6 @@ int adafs_open(const std::string& path, mode_t mode, int flags) { 
            return -1;

        }



#if defined(CHECK_ACCESS_DURING_OPEN)

        auto mask = F_OK; // F_OK == 0

        if ((mode & S_IRUSR) || (mode & S_IRGRP) || (mode & S_IROTH))

            mask = mask & R_OK;

        if ((mode & S_IWUSR) || (mode & S_IWGRP) || (mode & S_IWOTH))

            mask = mask & W_OK;

        if ((mode & S_IXUSR) || (mode & S_IXGRP) || (mode & S_IXOTH))

            mask = mask & X_OK;



        if( ! ((mask & md->mode()) == mask)) {

            errno = EACCES;

            return -1;

        }

#endif



        if(S_ISDIR(md->mode())) {

            return adafs_opendir(path);

        }