diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-09-11 20:29:35 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-09-11 20:29:35 +0100 |
| commit | 41d011ec6384589ebb8cc64fbea2abd937f5e478 (patch) | |
| tree | 56dec5c440da8e4369bba13dac86888b411bba0d /src/plugins | |
| parent | 678f31bbe6ad07767984db5f22b4ffd47909e0f6 (diff) | |
| parent | b51ce988891efc800acd2a2847d422c4cfba6109 (diff) | |
| download | rspamd-41d011ec6384589ebb8cc64fbea2abd937f5e478.tar.gz rspamd-41d011ec6384589ebb8cc64fbea2abd937f5e478.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/lua/antivirus.lua | 4 | ||||
| -rw-r--r-- | src/plugins/lua/milter_headers.lua | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua index 2b072f096..d6769071a 100644 --- a/src/plugins/lua/antivirus.lua +++ b/src/plugins/lua/antivirus.lua @@ -746,7 +746,6 @@ local av_types = { } local function add_antivirus_rule(sym, opts) - local rule = {} if not opts['type'] then return nil end @@ -759,9 +758,10 @@ local function add_antivirus_rule(sym, opts) 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']) diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua index 39cfb3298..2633d32f8 100644 --- a/src/plugins/lua/milter_headers.lua +++ b/src/plugins/lua/milter_headers.lua @@ -111,6 +111,7 @@ local settings = { softfail = 'DMARC_POLICY_SOFTFAIL', quarantine = 'DMARC_POLICY_QUARANTINE', }, + add_smtp_user = true, }, ['stat-signature'] = { header = 'X-Stat-Signature', |