From dbdae3228b8eb0d27d82caa43f3dd987c402dc31 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 17 Nov 2018 08:04:04 -0800
Subject: [PATCH] Don't bother to report the queue id as a debugging value

---
 debian/changelog                  |  6 ++++++
 debian/patches/queueid_in_envrcpt | 27 +++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 34 insertions(+)
 create mode 100644 debian/patches/queueid_in_envrcpt

diff --git a/debian/changelog b/debian/changelog
index 8c26a25..347beb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spamass-milter (0.4.0-3) unstable; urgency=medium
+
+  * Call the i macro only after envrcpt time. (closes: #696856)
+
+ -- Don Armstrong <don@debian.org>  Sat, 17 Nov 2018 08:02:28 -0800
+
 spamass-milter (0.4.0-2) unstable; urgency=medium
 
   * Document milter env variables (closes: #816799)
diff --git a/debian/patches/queueid_in_envrcpt b/debian/patches/queueid_in_envrcpt
new file mode 100644
index 0000000..98d072f
--- /dev/null
+++ b/debian/patches/queueid_in_envrcpt
@@ -0,0 +1,27 @@
+--- a/spamass-milter.cpp
++++ b/spamass-milter.cpp
+@@ -784,7 +784,6 @@
+ {
+   SpamAssassin* assassin;
+   struct context *sctx = (struct context *)smfi_getpriv(ctx);
+-  const char *queueid;
+ 
+   if (sctx == NULL)
+   {
+@@ -837,16 +836,6 @@
+   // remember the MAIL FROM address
+   assassin->set_from(string(envfrom[0]));
+   
+-  queueid=smfi_getsymval(ctx, const_cast<char *>("i"));
+-  if (!queueid)
+-  {
+-    queueid="unknown";
+-    warnmacro("i", "ENVFROM");
+-  }
+-  assassin->queueid = queueid;
+-
+-  debug(D_MISC, "queueid=%s", queueid);
+-
+   // tell Milter to continue
+   debug(D_FUNC, "mlfi_envfrom: exit");
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0b89743..0c34f8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 ignore_by_smtp_auth
 fix_spacing_in_received_header
 auth_in_received
+queueid_in_envrcpt
-- 
2.39.2