aboutsummaryrefslogtreecommitdiff
path: root/keyring/keyring.go
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2020-05-09 15:21:07 -0700
committerGitHub <noreply@github.com>2020-05-09 15:21:07 -0700
commit1cdefc21b8b07aad7aafeefd05d3124cf93b9216 (patch)
treeb5f304a4ecc101a5410bb2274d129dbc7dad6441 /keyring/keyring.go
parent338347ac4766f899fdc471d57f293798ff0e6c29 (diff)
parentde51add609bc74b7247ec4776bd694abbea24a45 (diff)
Merge pull request #217 from ebiggers/detect-incomplete-v1-locking
Try to detect incomplete locking of v1-encrypted directory
Diffstat (limited to 'keyring/keyring.go')
-rw-r--r--keyring/keyring.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/keyring/keyring.go b/keyring/keyring.go
index 6623943..fb9cc0e 100644
--- a/keyring/keyring.go
+++ b/keyring/keyring.go
@@ -173,7 +173,7 @@ func GetEncryptionKeyStatus(descriptor string, options *Options) (KeyStatus, err
if useFsKeyring {
return fsGetEncryptionKeyStatus(descriptor, options.Mount, options.User)
}
- _, err = userFindKey(buildKeyDescription(options, descriptor), options.User)
+ _, _, err = userFindKey(buildKeyDescription(options, descriptor), options.User)
if err != nil {
return KeyAbsent, nil
}