aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2016-08-04 17:34:44 +0100
committerGitHub <noreply@github.com>2016-08-04 17:34:44 +0100
commit6d33b6d3b8c824c6bc57830286939161ae4d1ff6 (patch)
tree38a286cb12bfef68572c431ed522401c5cee982e /src
parentabd7dd7e9de891ea6f0d7df9d9bf6ab50b85cfdf (diff)
parentdb8cb55bd6e001c735be65008621273fbdf81a88 (diff)
downloadrspamd-6d33b6d3b8c824c6bc57830286939161ae4d1ff6.tar.gz
rspamd-6d33b6d3b8c824c6bc57830286939161ae4d1ff6.zip
Merge pull request #808 from fatalbanana/spamassassin
Spamassassin plugin stuffs
Diffstat (limited to 'src')
-rw-r--r--src/plugins/lua/spamassassin.lua8
1 files changed, 7 insertions, 1 deletions
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))