[Fix] Fix loading of maps from UCL objects

diff --git a/src/libutil/map.c b/src/libutil/map.c
index 0ea3ce067a4e9f78572cffac19e81bc2e530e787..439a13e9495b991b732480c10fe649e0c36868d3 100644 (file)
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -1592,7 +1592,7 @@ rspamd_map_add_from_ucl (struct rspamd_config *cfg,
                }
 
                if (map->backends->len == 0) {
-                       msg_err_config ("map has no urls to be loaded");
+                       msg_err_config ("map has no urls to be loaded: empty list");
                        goto err;
                }
        }
@@ -1619,11 +1619,11 @@ rspamd_map_add_from_ucl (struct rspamd_config *cfg,
 
                elt = ucl_object_lookup_any (obj, "upstreams", "url", "urls", NULL);
                if (elt == NULL) {
-                       msg_err_config ("map has no urls to be loaded");
+                       msg_err_config ("map has no urls to be loaded: no elt");
                        goto err;
                }
 
-               if (ucl_object_type (obj) == UCL_ARRAY) {
+               if (ucl_object_type (elt) == UCL_ARRAY) {
                        /* Add array of maps as multiple backends */
                        while ((cur = ucl_object_iterate (elt, &it, true)) != NULL) {
                                if (ucl_object_type (cur) == UCL_STRING) {
@@ -1645,7 +1645,7 @@ rspamd_map_add_from_ucl (struct rspamd_config *cfg,
                        }
 
                        if (map->backends->len == 0) {
-                               msg_err_config ("map has no urls to be loaded");
+                               msg_err_config ("map has no urls to be loaded: empty object list");
                                goto err;
                        }
                }
@@ -1662,7 +1662,7 @@ rspamd_map_add_from_ucl (struct rspamd_config *cfg,
                }
 
                if (map->backends->len == 0) {
-                       msg_err_config ("map has no urls to be loaded");
+                       msg_err_config ("map has no urls to be loaded: no valid backends");
                        goto err;
                }
        }

diff --git a/src/plugins/lua/mid.lua b/src/plugins/lua/mid.lua
index 8c47578804b30c332be876c471652ef295a29bba..0ca26b91f182e4db69d59c497bd280416b9ef132 100644 (file)
--- a/src/plugins/lua/mid.lua
+++ b/src/plugins/lua/mid.lua
@@ -90,6 +90,6 @@ if opts then
 
     rspamd_config:register_dependency(id, settings['symbol_dkim_allow'])
   else
-    rspamd_logger.infox(rspamd_config, 'url is not specified, disabling module')
+    rspamd_logger.infox(rspamd_config, 'source is not specified, disabling module')
   end
 end