Avoid global variables in map logic.

* Add support of simple maps like '/path/to/file' as it seems to be more comfortable than 'file:///...'

5 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index ef494a736..7bb32db55 100644
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -158,12 +158,12 @@ dkim_module_config (struct config_file *cfg)
 		dkim_module_ctx->time_jitter = DEFAULT_TIME_JITTER;
 	}
 	if ((value = get_module_opt (cfg, "dkim", "whitelist")) != NULL) {
-		if (! add_map (value, read_radix_list, fin_radix_list, (void **)&dkim_module_ctx->whitelist_ip)) {
+		if (! add_map (cfg, value, read_radix_list, fin_radix_list, (void **)&dkim_module_ctx->whitelist_ip)) {
 			msg_warn ("cannot load whitelist from %s", value);
 		}
 	}
 	if ((value = get_module_opt (cfg, "dkim", "domains")) != NULL) {
-		if (! add_map (value, read_kv_list, fin_kv_list, (void **)&dkim_module_ctx->dkim_domains)) {
+		if (! add_map (cfg, value, read_kv_list, fin_kv_list, (void **)&dkim_module_ctx->dkim_domains)) {
 			msg_warn ("cannot load dkim domains list from %s", value);
 		}
 		else {
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 51bdd58c3..2f61ac1b3 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -419,7 +419,7 @@ fuzzy_check_module_config (struct config_file *cfg)
 
 	if ((value = get_module_opt (cfg, "fuzzy_check", "whitelist")) != NULL) {
 		fuzzy_module_ctx->whitelist = radix_tree_create ();
-		if (!add_map (value, read_radix_list, fin_radix_list, (void **)&fuzzy_module_ctx->whitelist)) {
+		if (!add_map (cfg, value, read_radix_list, fin_radix_list, (void **)&fuzzy_module_ctx->whitelist)) {
 			msg_err ("cannot add whitelist '%s'", value);	
 		}
 	}
diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c
index f8d1fb7fc..f5c94bd1f 100644
--- a/src/plugins/regexp.c
+++ b/src/plugins/regexp.c
@@ -611,7 +611,7 @@ regexp_module_config (struct config_file *cfg)
 		jb->buf = NULL;
 		jb->cfg = cfg;
 		*pjb = jb;
-		if (!add_map (value, json_regexp_read_cb, json_regexp_fin_cb, (void **)pjb)) {
+		if (!add_map (cfg, value, json_regexp_read_cb, json_regexp_fin_cb, (void **)pjb)) {
 			msg_err ("cannot add map %s", value);
 		}
 	}
diff --git a/src/plugins/spf.c b/src/plugins/spf.c
index 3502aba38..d10498699 100644
--- a/src/plugins/spf.c
+++ b/src/plugins/spf.c
@@ -138,7 +138,7 @@ spf_module_config (struct config_file *cfg)
 		cache_expire = DEFAULT_CACHE_MAXAGE;
 	}
 	if ((value = get_module_opt (cfg, "spf", "whitelist")) != NULL) {
-		if (! add_map (value, read_radix_list, fin_radix_list, (void **)&spf_module_ctx->whitelist_ip)) {
+		if (! add_map (cfg, value, read_radix_list, fin_radix_list, (void **)&spf_module_ctx->whitelist_ip)) {
 			msg_warn ("cannot load whitelist from %s", value);
 		}
 	}
diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 3d128b90d..18b8441ea 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -363,7 +363,7 @@ surbl_module_config (struct config_file *cfg)
 		surbl_module_ctx->read_timeout = DEFAULT_REDIRECTOR_READ_TIMEOUT;
 	}
 	if ((value = get_module_opt (cfg, "surbl", "redirector_hosts_map")) != NULL) {
-		add_map (value, read_redirectors_list, fin_redirectors_list, (void **)&surbl_module_ctx->redirector_hosts);
+		add_map (cfg, value, read_redirectors_list, fin_redirectors_list, (void **)&surbl_module_ctx->redirector_hosts);
 	}
 	else {
 		surbl_module_ctx->read_timeout = DEFAULT_REDIRECTOR_READ_TIMEOUT;
@@ -375,12 +375,12 @@ surbl_module_config (struct config_file *cfg)
 		surbl_module_ctx->max_urls = DEFAULT_SURBL_MAX_URLS;
 	}
 	if ((value = get_module_opt (cfg, "surbl", "exceptions")) != NULL) {
-		if (add_map (value, read_exceptions_list, fin_exceptions_list, (void **)&surbl_module_ctx->exceptions)) {
+		if (add_map (cfg, value, read_exceptions_list, fin_exceptions_list, (void **)&surbl_module_ctx->exceptions)) {
 			surbl_module_ctx->tld2_file = memory_pool_strdup (surbl_module_ctx->surbl_pool, value + sizeof ("file://") - 1);
 		}
 	}
 	if ((value = get_module_opt (cfg, "surbl", "whitelist")) != NULL) {
-		if (add_map (value, read_host_list, fin_host_list, (void **)&surbl_module_ctx->whitelist)) {
+		if (add_map (cfg, value, read_host_list, fin_host_list, (void **)&surbl_module_ctx->whitelist)) {
 			surbl_module_ctx->whitelist_file = memory_pool_strdup (surbl_module_ctx->surbl_pool, value + sizeof ("file://") - 1);
 		}
 	}