28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 4920d1ca6823abe29e8cf2eceea497d9b677ee95 Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Sun, 17 Aug 2025 21:05:24 +0900
|
|
Subject: [PATCH] cryptsetup: HAVE_CRYPT_SET_KEYRING_TO_LINK is always defined
|
|
|
|
Follow-up for c5daf14c88ba44cefabe052de93a29d28b6b0175 (v256).
|
|
|
|
(cherry picked from commit fb4aabf4432d523b97376099ce4353b5c268ae82)
|
|
|
|
Resolves: RHEL-118294
|
|
---
|
|
src/cryptsetup/cryptsetup.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
|
|
index 1f672f19f1..4dc315e810 100644
|
|
--- a/src/cryptsetup/cryptsetup.c
|
|
+++ b/src/cryptsetup/cryptsetup.c
|
|
@@ -493,7 +493,7 @@ static int parse_one_option(const char *option) {
|
|
log_warning_errno(r, "Failed to parse %s, ignoring: %m", option);
|
|
|
|
} else if ((val = startswith(option, "link-volume-key="))) {
|
|
-#ifdef HAVE_CRYPT_SET_KEYRING_TO_LINK
|
|
+#if HAVE_CRYPT_SET_KEYRING_TO_LINK
|
|
const char *sep, *c;
|
|
_cleanup_free_ char *keyring = NULL, *key_type = NULL, *key_description = NULL;
|
|
|