diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-15 17:28:06 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-15 17:28:06 +0000 |
| commit | 153e64677902c1acc7a1e8ee21d5b634d8a65885 (patch) | |
| tree | f6055a7c820e067218142be908165a7746d192f3 /src/plugins/dkim_check.c | |
| parent | df75947ab9f8bdd9eb2b5c05384d49e247c8b41d (diff) | |
| download | rspamd-153e64677902c1acc7a1e8ee21d5b634d8a65885.tar.gz rspamd-153e64677902c1acc7a1e8ee21d5b634d8a65885.zip | |
Fix logging for embedded maps
Diffstat (limited to 'src/plugins/dkim_check.c')
| -rw-r--r-- | src/plugins/dkim_check.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c index a30a52e6e..8147eb270 100644 --- a/src/plugins/dkim_check.c +++ b/src/plugins/dkim_check.c @@ -220,6 +220,7 @@ gint dkim_module_config (struct rspamd_config *cfg) { const ucl_object_t *value; + const gchar *str; gint res = TRUE, cb_id; guint cache_size, cache_expire; gboolean got_trusted = FALSE; @@ -277,11 +278,16 @@ dkim_module_config (struct rspamd_config *cfg) } if ((value = rspamd_config_get_module_opt (cfg, "dkim", "whitelist")) != NULL) { - if (!rspamd_map_add (cfg, ucl_obj_tostring (value), - "DKIM whitelist", rspamd_radix_read, rspamd_radix_fin, - (void **)&dkim_module_ctx->whitelist_ip)) { - radix_add_generic_iplist (ucl_obj_tostring (value), - &dkim_module_ctx->whitelist_ip); + str = ucl_obj_tostring (value); + if (!rspamd_map_is_map (str)) { + radix_add_generic_iplist (str, + &dkim_module_ctx->whitelist_ip); + } + else { + rspamd_map_add (cfg, str, + "DKIM whitelist", rspamd_radix_read, rspamd_radix_fin, + (void **)&dkim_module_ctx->whitelist_ip); + } } if ((value = |