From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 24 Dec 2013 18:55:47 +0000 (+0000)
Subject: Remove HELO_NOT_FQDN as it exists in hfilter.
X-Git-Tag: 0.6.6~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=928d072ceca774b81c390675b24a44c1498f8eac;p=rspamd.git

Remove HELO_NOT_FQDN as it exists in hfilter.

Submitted by: AL
---

diff --git a/conf/lua/rspamd.lua b/conf/lua/rspamd.lua
index f51715934..e8b585837 100644
--- a/conf/lua/rspamd.lua
+++ b/conf/lua/rspamd.lua
@@ -68,25 +68,6 @@ reconf['DATE_IN_PAST'] = function(task)
 	return false
 end
 
-reconf['HELO_NOT_FQDN'] = function(task)
-local helo = task:get_helo()
-
-local function check_regexp(str, regexp_text)
-    local re = regexp.get_cached(regexp_text)
-    if not re then re = regexp.create(regexp_text, 'i') end
-    if re:match(str) then return true end
-    return false
-end
-
-if helo then
-    if not check_regexp(helo, '(?=^.{4,255}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\\.)+[a-zA-Z]{2,63}$)') then
-        return true
-    end
-end
-
-return false
-end
-
 local function file_exists(filename)
 	local file = io.open(filename)
 	if file then
diff --git a/conf/metrics.conf b/conf/metrics.conf
index 0489f90e6..2b91093e3 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -693,11 +693,6 @@ metric {
         description = "Message date is in past";
         name = "DATE_IN_PAST";
     }
-    symbol {
-        weight = 1.5;
-        description = "Helo host FQDN check";
-        name = "HELO_NOT_FQDN";
-    }
 # hfilter symbols
 	symbol { weight = 1.00; name = "HFILTER_HELO_1"; description = "Helo host checks (very low)"; }
 	symbol { weight = 2.00; name = "HFILTER_HELO_2"; description = "Helo host checks (low)"; }