summaryrefslogtreecommitdiff
path: root/internal/fusefrontend_reverse
diff options
context:
space:
mode:
authorJakob Unterwurzacher2019-03-26 20:59:52 +0100
committerJakob Unterwurzacher2019-03-26 20:59:52 +0100
commitfba9b2b9951c5e6f53727380d2dd33938cd1eb4d (patch)
tree2be186a46c942f8490c950215b6f849a6dadc2ee /internal/fusefrontend_reverse
parent3bc100aeb3f0763f78c8b3a70165b9f8aaa52db5 (diff)
reverse: don't show gocryptfs.conf if a custom config path was passed
GetAttr checks for this, but OpenDir did not. https://github.com/rfjakob/gocryptfs/issues/385
Diffstat (limited to 'internal/fusefrontend_reverse')
-rw-r--r--internal/fusefrontend_reverse/rfs.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/fusefrontend_reverse/rfs.go b/internal/fusefrontend_reverse/rfs.go
index 01ed122..49ce0a1 100644
--- a/internal/fusefrontend_reverse/rfs.go
+++ b/internal/fusefrontend_reverse/rfs.go
@@ -379,7 +379,8 @@ func (rfs *ReverseFS) OpenDir(cipherPath string, context *fuse.Context) ([]fuse.
for i := range entries {
var cName string
// ".gocryptfs.reverse.conf" in the root directory is mapped to "gocryptfs.conf"
- if cipherPath == "" && entries[i].Name == configfile.ConfReverseName {
+ if cipherPath == "" && entries[i].Name == configfile.ConfReverseName &&
+ !rfs.args.ConfigCustom {
cName = configfile.ConfDefaultName
} else {
cName = rfs.nameTransform.EncryptName(entries[i].Name, dirIV)