From: Andrew Lewis <nerf@judo.za.org>
Date: Sun, 21 Aug 2016 16:21:28 +0000 (+0200)
Subject: [Minor] Fix log message
X-Git-Tag: 1.3.4~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F872%2Fhead;p=thirdparty%2Frspamd.git

[Minor] Fix log message

 - Also clean up X_PHP_EVAL rule
---

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index 8f6e47ee9b..6ec37181fa 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -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'
 }
diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index c9444b23d8..74f395cf86 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -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