diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-10-03 15:49:04 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-10-03 15:49:04 +0100 |
| commit | e18d27fb6cccc144fa3a7d896053b2e9cbe70da6 (patch) | |
| tree | 108a723f3eb79aacfbbe8ee13842eb37e37b6431 /src/plugins | |
| parent | 51b4e9df7df20558bc8dd95170bdf228ec79bf62 (diff) | |
| download | rspamd-e18d27fb6cccc144fa3a7d896053b2e9cbe70da6.tar.gz rspamd-e18d27fb6cccc144fa3a7d896053b2e9cbe70da6.zip | |
Fix SPF plugin.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/spf.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/plugins/spf.c b/src/plugins/spf.c index 273243c13..26f05f50a 100644 --- a/src/plugins/spf.c +++ b/src/plugins/spf.c @@ -101,44 +101,46 @@ spf_module_init (struct config_file *cfg, struct module_ctx **ctx) gint spf_module_config (struct config_file *cfg) { - gchar *value; + rspamd_cl_object_t *value; gint res = TRUE; guint cache_size, cache_expire; spf_module_ctx->whitelist_ip = radix_tree_create (); if ((value = get_module_opt (cfg, "spf", "symbol_fail")) != NULL) { - spf_module_ctx->symbol_fail = memory_pool_strdup (spf_module_ctx->spf_pool, value); + spf_module_ctx->symbol_fail = rspamd_cl_obj_tostring (value); } else { spf_module_ctx->symbol_fail = DEFAULT_SYMBOL_FAIL; } if ((value = get_module_opt (cfg, "spf", "symbol_softfail")) != NULL) { - spf_module_ctx->symbol_softfail = memory_pool_strdup (spf_module_ctx->spf_pool, value); + spf_module_ctx->symbol_softfail = rspamd_cl_obj_tostring (value); } else { spf_module_ctx->symbol_softfail = DEFAULT_SYMBOL_SOFTFAIL; } if ((value = get_module_opt (cfg, "spf", "symbol_allow")) != NULL) { - spf_module_ctx->symbol_allow = memory_pool_strdup (spf_module_ctx->spf_pool, value); + spf_module_ctx->symbol_allow = rspamd_cl_obj_tostring (value); } else { spf_module_ctx->symbol_allow = DEFAULT_SYMBOL_ALLOW; } if ((value = get_module_opt (cfg, "spf", "spf_cache_size")) != NULL) { - cache_size = strtoul (value, NULL, 10); + cache_size = rspamd_cl_obj_toint (value); } else { cache_size = DEFAULT_CACHE_SIZE; } if ((value = get_module_opt (cfg, "spf", "spf_cache_expire")) != NULL) { - cache_expire = cfg_parse_time (value, TIME_SECONDS) / 1000; + cache_expire = rspamd_cl_obj_toint (value); } else { cache_expire = DEFAULT_CACHE_MAXAGE; } if ((value = get_module_opt (cfg, "spf", "whitelist")) != NULL) { - if (! add_map (cfg, value, "SPF whitelist", read_radix_list, fin_radix_list, (void **)&spf_module_ctx->whitelist_ip)) { + if (! add_map (cfg, rspamd_cl_obj_tostring (value), + "SPF whitelist", read_radix_list, fin_radix_list, + (void **)&spf_module_ctx->whitelist_ip)) { msg_warn ("cannot load whitelist from %s", value); } } |