]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Fix] Fix maps descriptions
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Sat, 16 Jul 2016 22:41:15 +0000 (23:41 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Sat, 16 Jul 2016 22:44:58 +0000 (23:44 +0100)
Issue: #712
Reported by: @andypl78

src/libutil/map.c
src/plugins/lua/mime_types.lua

index c5123631ffb6540816ff5c221da6a86b28e525d7..fd744cd725644b743fe8627f169f956a2bb0a102 100644 (file)
@@ -1318,7 +1318,7 @@ rspamd_map_add_from_ucl (struct rspamd_config *cfg,
 
        if (ucl_object_type (obj) == UCL_STRING) {
                /* Just a plain string */
-               return rspamd_map_add (cfg, ucl_object_tostring (obj), NULL,
+               return rspamd_map_add (cfg, ucl_object_tostring (obj), description,
                                read_callback, fin_callback, user_data);
        }
 
index b3216d6c7a790a58865a553c3b4de93dcb3b1b96..d598f2e8a122d38ca955b7b8a5f293484d7a9790 100644 (file)
@@ -210,13 +210,13 @@ if opts then
       map = rspamd_config:add_map ({
         url = settings['file'],
         type = 'regexp',
-        description = 'mime types map'
+        description = 'mime types map (regexps)'
       })
     else
       map = rspamd_config:add_map ({
         url = settings['file'],
         type = 'map',
-        description = 'mime types map'
+        description = 'mime types map (plain)'
       })
     end
     local id = rspamd_config:register_symbol({