diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-09-19 20:29:58 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-09-19 20:29:58 +0400 |
| commit | 91d183b8f4719ecc6b339cc3e8d9239bf7594e30 (patch) | |
| tree | e4a548ed5570d425d87ac0aa684900179eaabe4e /src/plugins/surbl.c | |
| parent | 1bdd1f05773d1f16f4fc271e09a691a1750e0ed5 (diff) | |
| download | rspamd-91d183b8f4719ecc6b339cc3e8d9239bf7594e30.tar.gz rspamd-91d183b8f4719ecc6b339cc3e8d9239bf7594e30.zip | |
Avoid global variables in map logic.
* Add support of simple maps like '/path/to/file' as it seems to be more comfortable than 'file:///...'
Diffstat (limited to 'src/plugins/surbl.c')
| -rw-r--r-- | src/plugins/surbl.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); } } |