From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 2 Nov 2023 16:56:47 +0000 (+0100)
Subject: cryptsetup: honour configured ask password flags also when activating via token
X-Git-Tag: v255-rc1~32^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58925605e7193328976af462c8f718e23015b8bf;p=thirdparty%2Fsystemd.git

cryptsetup: honour configured ask password flags also when activating via token

See: #28665 (this is not a fix for that PR though)
---

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 618fd91d5c0..dd435b23a24 100644
--- 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;