From 649ccfdba0de759a445f615583ca5fcff6773b89 Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Fri, 31 May 2024 14:38:03 +0200
Subject: Fix session.rcpt.script IfBlock variable name

---
 .github/ISSUE_TEMPLATE/bug_report.yml    |  5 ++---
 crates/common/src/config/smtp/session.rs |  2 +-
 crates/smtp/src/inbound/ehlo.rs          |  2 +-
 crates/smtp/src/scripts/exec.rs          | 12 +++++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index bc5101a8..7d44bb14 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -31,11 +31,10 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
+        - v0.8.x
         - v0.7.x
         - v0.6.x
-        - v0.5.x
-        - v0.4.x
-        - v0.3.x or lower
+        - v0.5.x or lower
     validations:
       required: true
   - type: dropdown
diff --git a/crates/common/src/config/smtp/session.rs b/crates/common/src/config/smtp/session.rs
index c37594ad..a8f2d4b3 100644
--- a/crates/common/src/config/smtp/session.rs
+++ b/crates/common/src/config/smtp/session.rs
@@ -609,7 +609,7 @@ impl Default for SessionConfig {
                 rewrite: IfBlock::empty("session.mail.rewrite"),
             },
             rcpt: Rcpt {
-                script: IfBlock::empty("session.rcpt."),
+                script: IfBlock::empty("session.rcpt.script"),
                 relay: IfBlock::new::<()>(
                     "session.rcpt.relay",
                     [("!is_empty(authenticated_as)", "true")],
diff --git a/crates/smtp/src/inbound/ehlo.rs b/crates/smtp/src/inbound/ehlo.rs
index 1d76eba5..c049502c 100644
--- a/crates/smtp/src/inbound/ehlo.rs
+++ b/crates/smtp/src/inbound/ehlo.rs
@@ -116,7 +116,7 @@ impl<T: SessionStream> Session<T> {
 
         if !is_extended {
             return self
-                .write(format!("250 {} says hello\r\n", self.hostname).as_bytes())
+                .write(format!("250 {} you had me at HELO\r\n", self.hostname).as_bytes())
                 .await;
         }
 
diff --git a/crates/smtp/src/scripts/exec.rs b/crates/smtp/src/scripts/exec.rs
index ff9fa602..6592920c 100644
--- a/crates/smtp/src/scripts/exec.rs
+++ b/crates/smtp/src/scripts/exec.rs
@@ -140,10 +140,12 @@ impl<T: SessionStream> Session<T> {
         script: Arc<Sieve>,
         params: ScriptParameters<'_>,
     ) -> ScriptResult {
-        let core = self.core.clone();
-        let span = self.span.clone();
-        let params = params.with_envelope(&self.core.core, self).await;
-
-        core.run_script(script, params, span).await
+        self.core
+            .run_script(
+                script,
+                params.with_envelope(&self.core.core, self).await,
+                self.span.clone(),
+            )
+            .await
     }
 }
-- 
cgit v1.2.3-70-g09d2