Browse Source

Merge pull request #872 from fatalbanana/d

[Minor] Fix log message
tags/1.3.4
Vsevolod Stakhov 7 years ago
parent
commit
0807815a0a
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      rules/regexp/headers.lua
  2. 1
    1
      src/plugins/lua/dmarc.lua

+ 2
- 2
rules/regexp/headers.lua View File

@@ -436,8 +436,8 @@ reconf['FORGED_GENERIC_RECEIVED5'] = 'Received=/\\s*from \\[(\\d{1,3}\\.\\d{1,3}
reconf['INVALID_POSTFIX_RECEIVED'] = 'Received=/ \\(Postfix\\) with ESMTP id [A-Z\\d]+([\\s\\r\\n]+for <\\S+?>)?;[\\s\\r\\n]*[A-Z][a-z]{2}, \\d{1,2} [A-Z][a-z]{2} \\d\\d\\d\\d \\d\\d:\\d\\d:\\d\\d [\\+\\-]\\d\\d\\d\\d$/X'

reconf['X_PHP_EVAL'] = {
re = "X-PHP-Originating-Script=/\\s:\\seval\\(\\)'d code$/X",
re = "X-PHP-Originating-Script=/ : eval\\(\\)'d code$/X",
score = 4.0,
description = "Message sent by eval()'d php code",
description = "Message sent by eval()'d PHP code",
group = 'header'
}

+ 1
- 1
src/plugins/lua/dmarc.lua View File

@@ -58,7 +58,7 @@ local function dmarc_callback(task)
local ip_addr = task:get_ip()

if task:get_user() or (ip_addr and ip_addr:is_local()) then
rspamd_logger.infox(task, "skip SPF checks for local networks and authorized users");
rspamd_logger.infox(task, "skip DMARC checks for local networks and authorized users");
return
end
if from and from[1] and from[1]['domain'] and not from[2] then

Loading…
Cancel
Save