From 37457cce5b0436493dba7cdac6e1af5f51d25f47 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 9 May 2020 14:52:07 -0700 Subject: actions/protector: improve errors ErrProtectorName: Rename to ErrLoginProtectorName for clarity, and include the name and user. ErrMissingProtectorName: Include the correct protector source. ErrDuplicateName: Rename to ErrProtectorNameExists for clarity, and remove a level of wrapping by including the name directly. ErrDuplicateUID: Rename to ErrLoginProtectorExists for clarity, and remove a level of wrapping by including the user directly. --- cli-tests/t_encrypt_custom.out | 2 +- cli-tests/t_encrypt_login.out | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'cli-tests') diff --git a/cli-tests/t_encrypt_custom.out b/cli-tests/t_encrypt_custom.out index 572529a..e7b8656 100644 --- a/cli-tests/t_encrypt_custom.out +++ b/cli-tests/t_encrypt_custom.out @@ -46,7 +46,7 @@ PROTECTOR LINKED DESCRIPTION desc6 No custom protector "prot" # Try to use a custom protector without a name -[ERROR] fscrypt encrypt: custom protectors must have a name +[ERROR] fscrypt encrypt: custom_passphrase protectors must be named Use --name=PROTECTOR_NAME to specify a protector name. ext4 filesystem "MNT" has 0 protectors and 0 policies diff --git a/cli-tests/t_encrypt_login.out b/cli-tests/t_encrypt_login.out index c6eb463..7ee66a2 100644 --- a/cli-tests/t_encrypt_login.out +++ b/cli-tests/t_encrypt_login.out @@ -130,7 +130,11 @@ POLICY UNLOCKED PROTECTORS desc34 Yes desc35 # Try to give a login protector a name -[ERROR] fscrypt encrypt: login protectors do not need a name +[ERROR] fscrypt encrypt: cannot assign name "prot" to new login protector for + user "fscrypt-test-user" because login protectors are + identified by user, not by name. + +To fix this, don't specify the --name=PROTECTOR_NAME option. ext4 filesystem "MNT" has 0 protectors and 0 policies ext4 filesystem "MNT_ROOT" has 0 protectors and 0 policies -- cgit v1.2.3