From dc4fdd8f44a9c54f20a13e576eeb140a636e9ee2 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sat, 8 Oct 2016 23:50:19 +0200 Subject: [PATCH] main: fix shadow detection logic This fired incorrectly: Mountpoint "/home/testuser" would shadow cipherdir "/home/testuser.cipher", this is not supported --- mount.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mount.go b/mount.go index 000d632..3157332 100644 --- a/mount.go +++ b/mount.go @@ -38,7 +38,7 @@ func doMount(args *argContainer) int { } // We cannot mount "/home/user/.cipher" at "/home/user" because the mount // will hide ".cipher" also for us. - if strings.HasPrefix(args.cipherdir, args.mountpoint) { + if args.cipherdir == args.mountpoint || strings.HasPrefix(args.cipherdir, args.mountpoint+"/") { tlog.Fatal.Printf("Mountpoint %q would shadow cipherdir %q, this is not supported", args.mountpoint, args.cipherdir) os.Exit(ErrExitMountPoint)