From db8cb55bd6e001c735be65008621273fbdf81a88 Mon Sep 17 00:00:00 2001
From: Andrew Lewis <nerf@judo.za.org>
Date: Thu, 4 Aug 2016 14:51:12 +0100
Subject: [PATCH] [Fix] SpamAssassin plugin: support
 check_freemail_header('EnvelopeFrom', [..])

---
 src/plugins/lua/spamassassin.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua
index 618cae410..cf17aa247 100644
--- a/src/plugins/lua/spamassassin.lua
+++ b/src/plugins/lua/spamassassin.lua
@@ -307,7 +307,13 @@ local function gen_eval_rule(arg)
         end
 
         if arg then
-          local h = task:get_header(arg)
+          local h
+          if arg == 'EnvelopeFrom' then
+            h = task:get_from('smtp')
+            if h then h = h[1]['addr'] end
+          else
+            h = task:get_header(arg)
+          end
           if h then
             local hdr_freemail = freemail_search(string.lower(h))
 
-- 
2.39.5