From 38cce239c1510e3736b095b95a65374192ee0312 Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Fri, 3 Nov 2023 16:28:14 +0100 Subject: [PATCH] cryptsetup: do not print (null) if pkcs11 uri not set The pkcs11 uri is no set if the smart card is not inserted while using `pkcs11-uri=auto` with libcryptsetup plugins. ``` > systemd-cryptsetup attach cr_data /dev/sda1 - pkcs11-uri=auto Set cipher aes, mode xts-plain64, key size 512 bits for device /dev/sda1. Security token (null) not present for unlocking volume Linux filesystem (cr_data), please plug it in. ``` --- src/cryptsetup/cryptsetup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 1da7bff049..6d927ef8dd 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -1503,8 +1503,8 @@ static int attach_luks_or_plain_or_bitlk_by_pkcs11( if (r < 0) return r; - log_notice("Security token %s not present for unlocking volume %s, please plug it in.", - uri, friendly); + log_notice("Security token%s%s not present for unlocking volume %s, please plug it in.", + uri ? " " : "", strempty(uri), friendly); /* Let's immediately rescan in case the token appeared in the time we needed * to create and configure the monitor */ -- 2.25.1