From 336c4876e27b6b51f9e956a0883592a1f76d23a2 Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Wed, 31 Jul 2024 20:05:42 +0200
Subject: [PATCH] Do not provide {auth_authen} Milter macro unless the user is
 authenticated

---
 crates/smtp/src/inbound/milter/message.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/crates/smtp/src/inbound/milter/message.rs b/crates/smtp/src/inbound/milter/message.rs
index f7831e33..16645b05 100644
--- a/crates/smtp/src/inbound/milter/message.rs
+++ b/crates/smtp/src/inbound/milter/message.rs
@@ -232,9 +232,13 @@ impl<T: SessionStream> Session<T> {
                 .mail_from(
                     &format!("<{addr}>"),
                     None::<&[&str]>,
-                    Macros::new()
-                        .with_mail_address(addr)
-                        .with_sasl_login_name(&self.data.authenticated_as),
+                    if !self.data.authenticated_as.is_empty() {
+                        Macros::new()
+                            .with_mail_address(addr)
+                            .with_sasl_login_name(&self.data.authenticated_as)
+                    } else {
+                        Macros::new().with_mail_address(addr)
+                    },
                 )
                 .await?
                 .assert_continue()?;