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 f51715934d89452b32c1b5d1d7ef7822c21834ca..e8b5858375a14b0343f034a473b3f02986073b55 100644 (file)
--- 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 0489f90e6d4d392bce08f764ec5ac6cd80621a11..2b91093e3ae5602e90aeec0ecd23282aeb7970d8 100644 (file)
--- 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)"; }