From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 1 Dec 2016 11:48:36 +0000 (+0000)
Subject: [Fix] Really fix chained SA dependencies
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F1213%2Fhead;p=rspamd.git

[Fix] Really fix chained SA dependencies

Conflicts:
	src/plugins/lua/spamassassin.lua
---

diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua
index 27940212a..64e130809 100644
--- a/src/plugins/lua/spamassassin.lua
+++ b/src/plugins/lua/spamassassin.lua
@@ -1495,7 +1495,7 @@ local function post_process()
         local expr_atoms = r['expression']:atoms()
         for i,a in ipairs(expr_atoms) do
           if type(external_deps[a]) == 'table' then
-            for _,dep in ipairs(external_deps[a]) do
+            for dep in pairs(external_deps[a]) do
               if not external_deps[k] then
                 external_deps[k] = {}
               end
@@ -1503,11 +1503,11 @@ local function post_process()
                 rspamd_config:register_dependency(k, dep)
                 external_deps[k][dep] = true
                 rspamd_logger.debugx(rspamd_config,
-                  'atom %1 is a direct foreign dependency, ' ..
+                  'atom %1 is an indirect foreign dependency, ' ..
                   'register dependency for %2 on %3',
                   a, k, dep)
+                  nchanges = nchanges + 1
               end
-              nchanges = nchanges + 1
             end
           else
             local rspamd_symbol, replaced_symbol = replace_symbol(a)