diff options
Diffstat (limited to 'internal/fusefrontend')
| -rw-r--r-- | internal/fusefrontend/fs.go | 2 | ||||
| -rw-r--r-- | internal/fusefrontend/openbackingdir_test.go | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/internal/fusefrontend/fs.go b/internal/fusefrontend/fs.go index decd13f..096e663 100644 --- a/internal/fusefrontend/fs.go +++ b/internal/fusefrontend/fs.go @@ -626,7 +626,7 @@ func (fs *FS) Access(relPath string, mode uint32, context *fuse.Context) (code f if err != nil { return fuse.ToStatus(err) } - err = unix.Faccessat(dirfd, cName, mode, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, cName, mode) syscall.Close(dirfd) return fuse.ToStatus(err) } diff --git a/internal/fusefrontend/openbackingdir_test.go b/internal/fusefrontend/openbackingdir_test.go index 9c2358e..82cc74d 100644 --- a/internal/fusefrontend/openbackingdir_test.go +++ b/internal/fusefrontend/openbackingdir_test.go @@ -7,6 +7,7 @@ import ( "golang.org/x/sys/unix" + "github.com/rfjakob/gocryptfs/internal/syscallcompat" "github.com/rfjakob/gocryptfs/tests/test_helpers" ) @@ -45,11 +46,11 @@ func TestOpenBackingDir(t *testing.T) { t.Fatal("cName should be .") } - err = unix.Faccessat(dirfd, cName, unix.R_OK, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK) if err != nil { t.Error(err) } - err = unix.Faccessat(dirfd, ".", unix.R_OK, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, ".", unix.R_OK) if err != nil { t.Error(err) } @@ -62,7 +63,7 @@ func TestOpenBackingDir(t *testing.T) { if cName == "" { t.Fatal("cName should not be empty") } - err = unix.Faccessat(dirfd, cName, unix.R_OK, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK) if err != nil { t.Error(err) } @@ -75,7 +76,7 @@ func TestOpenBackingDir(t *testing.T) { if cName == "" { t.Fatal("cName should not be empty") } - err = unix.Faccessat(dirfd, cName, unix.R_OK, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK) if err != nil { t.Error(err) } @@ -94,7 +95,7 @@ func TestOpenBackingDir(t *testing.T) { if len(cName) >= 255 { t.Fatalf("cName is too long: %q", cName) } - err = unix.Faccessat(dirfd, cName, unix.R_OK, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK) if err != nil { t.Error(err) } @@ -125,11 +126,11 @@ func TestOpenBackingDirPlaintextNames(t *testing.T) { if cName != "." { t.Fatal("cName should be .") } - err = unix.Faccessat(dirfd, cName, unix.R_OK, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK) if err != nil { t.Error(err) } - err = unix.Faccessat(dirfd, ".", unix.R_OK, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, ".", unix.R_OK) if err != nil { t.Error(err) } @@ -142,7 +143,7 @@ func TestOpenBackingDirPlaintextNames(t *testing.T) { if cName != "dir1" { t.Fatalf("wrong cName: %q", cName) } - err = unix.Faccessat(dirfd, cName, unix.R_OK, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK) if err != nil { t.Error(err) } @@ -155,7 +156,7 @@ func TestOpenBackingDirPlaintextNames(t *testing.T) { if cName != "dir2" { t.Fatalf("wrong cName: %q", cName) } - err = unix.Faccessat(dirfd, cName, unix.R_OK, unix.AT_SYMLINK_NOFOLLOW) + err = syscallcompat.Faccessat(dirfd, cName, unix.R_OK) if err != nil { t.Error(err) } |