From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 16 Jul 2016 22:41:15 +0000 (+0100)
Subject: [Fix] Fix maps descriptions
X-Git-Tag: 1.3.0~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f86a899d306a2f8fd459219ad7ed5d1ef56d2e0b;p=thirdparty%2Frspamd.git

[Fix] Fix maps descriptions

Issue: #712
Reported by: @andypl78
---

diff --git a/src/libutil/map.c b/src/libutil/map.c
index c5123631ff..fd744cd725 100644
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -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);
 	}
 
diff --git a/src/plugins/lua/mime_types.lua b/src/plugins/lua/mime_types.lua
index b3216d6c7a..d598f2e8a1 100644
--- a/src/plugins/lua/mime_types.lua
+++ b/src/plugins/lua/mime_types.lua
@@ -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({