From 24a4110f1c8d1da95d17c634a78ea3f63e7716e5 Mon Sep 17 00:00:00 2001 From: Yutaro Mori Date: Fri, 27 Jul 2018 15:04:46 +0900 Subject: [PATCH] keystore: do not exclude symlink keystores --- accounts/keystore/file_cache.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 26da34dcfd..cc42df6992 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -62,7 +62,7 @@ func (fc *fileCache) scan(keyDir string) (mapset.Set, mapset.Set, mapset.Set, er log.Trace("Ignoring file on account scan", "path", path) continue } - // Gather the set of all and fresly modified files + // Gather the set of all freshly modified files all.Add(path) modified := fi.ModTime() @@ -95,7 +95,8 @@ func skipKeyFile(fi os.FileInfo) bool { return true } // Skip misc special files, directories (yes, symlinks too). - if fi.IsDir() || fi.Mode()&os.ModeType != 0 { + excludedModes := os.ModeDir | os.ModeNamedPipe | os.ModeSocket | os.ModeDevice + if fi.IsDir() || fi.Mode()&excludedModes != 0 { return true } return false