set empty <> user or addr for msgs without FROM (the MAIL FROM:<> is RFC 821 defined...

diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua
index afb88b4e7f15502090694eec1e40adb1b814e056..4f0d908db548e906aae188ca7f95dd1c53633db9 100644 (file)
--- a/src/plugins/lua/ratelimit.lua
+++ b/src/plugins/lua/ratelimit.lua
@@ -179,9 +179,11 @@ local function rate_test_set(task, func)
        end
        -- Parse from
        local from = task:get_from()
-       local from_user = ''
+       local from_user = '<>'
+       local from_addr = '<>'
        if from then
                from_user = from[1]['user']
+               from_addr = from[1]['addr']
        end
        -- Get user (authuser)
        local auser = task:get_user()
@@ -189,7 +191,7 @@ local function rate_test_set(task, func)
                func(task, settings['user'], make_rate_key (auser, '<auth>', nil))
        end
 
-       if not from_user or not rcpts_user[1] then
+       if not rcpts_user[1] then
                -- Nothing to check
                return
        end
@@ -207,7 +209,7 @@ local function rate_test_set(task, func)
                func(task, settings['to'], make_rate_key (nil, r['addr'], nil))
                if ip then
                        func(task, settings['to_ip'], make_rate_key (nil, r['addr'], ip))
-                       func(task, settings['to_ip_from'], make_rate_key (from[1]['addr'], r['addr'], ip))
+                       func(task, settings['to_ip_from'], make_rate_key (from_addr, r['addr'], ip))
                end
        end
 end