Merge remote-tracking branch 'origin/master'

diff --cc src/plugins/lua/antivirus.lua
index 2b072f096b88cd6e349bb722d640a39046777795,652ab03f69dd4846c719429aea3f2fba4fb35e44..d6769071a3a35177865f3ca7872fde6610705c5a
--- 1/src/plugins/lua/antivirus.lua
--- 2/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'])