From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 11 Sep 2017 19:29:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.7.0~652
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41d011ec6384589ebb8cc64fbea2abd937f5e478;p=thirdparty%2Frspamd.git

Merge remote-tracking branch 'origin/master'
---

41d011ec6384589ebb8cc64fbea2abd937f5e478
diff --cc src/plugins/lua/antivirus.lua
index 2b072f096b,652ab03f69..d6769071a3
--- a/src/plugins/lua/antivirus.lua
+++ b/src/plugins/lua/antivirus.lua
@@@ -759,9 -751,8 +758,10 @@@ local function add_antivirus_rule(sym, 
        opts['type'])
    end
  
-   rule = cfg.configure(opts)
+   local rule = cfg.configure(opts)
 +  rule.type = opts.type
 +
+ 
    if not rule then
      rspamd_logger.errx(rspamd_config, 'cannot configure %s for %s',
        opts['type'], opts['symbol'])