From 19dd24e24caec28a3afbc2a10ea44f3c9628ba39 Mon Sep 17 00:00:00 2001 From: Guilhem Zeitoun Date: Wed, 15 Jul 2026 07:06:44 +0200 Subject: [PATCH] bad use of get_env_str --- src/mail.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mail.rs b/src/mail.rs index d6ed18d4..ff8a2e2b 100644 --- a/src/mail.rs +++ b/src/mail.rs @@ -705,9 +705,9 @@ async fn send_with_selected_transport(email: Message) -> EmptyResult { } pub fn check_dkim() -> Result, String> { match ( - CONFIG.dkim_signing_key().and_then(|a| get_env_str_value(&a)), - CONFIG.dkim_domain().and_then(|a| get_env_str_value(&a)), - CONFIG.dkim_selector().and_then(|a| get_env_str_value(&a)), //get_env_str should return None only if variables are not set, which is already checked + CONFIG.dkim_signing_key().or_else(|| get_env_str_value("dkim_signing_key")), + CONFIG.dkim_domain().or_else(|| get_env_str_value("dkim_domain")), + CONFIG.dkim_selector().or_else(|| get_env_str_value("dkim_selector")), ) { (Some(sig), Some(domain), Some(selector)) => { let config = {