projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c50a777
)
cryptsetup: honour configured ask password flags also when activating via token
author
Lennart Poettering
<lennart@poettering.net>
Thu, 2 Nov 2023 16:56:47 +0000
(17:56 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 2 Nov 2023 21:37:46 +0000
(22:37 +0100)
See: #28665 (this is not a fix for that PR though)
src/cryptsetup/cryptsetup.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup/cryptsetup.c
b/src/cryptsetup/cryptsetup.c
index 618fd91d5c003a285e75fe32f632efb8d0d546ad..dd435b23a248ef06bfffc2ea25b22a4b9d3b741a 100644
(file)
--- a/
src/cryptsetup/cryptsetup.c
+++ b/
src/cryptsetup/cryptsetup.c
@@
-1182,7
+1182,7
@@
static int crypt_activate_by_token_pin_ask_password(
const char *credential_name) {
#if HAVE_LIBCRYPTSETUP_PLUGINS
- AskPasswordFlags flags = ASK_PASSWORD_PUSH_CACHE | ASK_PASSWORD_ACCEPT_CACHED;
+ AskPasswordFlags flags =
arg_ask_password_flags |
ASK_PASSWORD_PUSH_CACHE | ASK_PASSWORD_ACCEPT_CACHED;
_cleanup_strv_free_erase_ char **pins = NULL;
int r;