diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-10-26 12:14:17 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-10-26 12:26:52 +0000 |
| commit | f84b86d901c8ba53147ae89bce894f58e0448be3 (patch) | |
| tree | 05a9ac919951becad5253bfe45d439a622379d86 /src/libserver/cfg_utils.c | |
| parent | 06c92488d21d4eefa8f58a498a1ea174856ccd4f (diff) | |
| download | rspamd-f84b86d901c8ba53147ae89bce894f58e0448be3.tar.gz rspamd-f84b86d901c8ba53147ae89bce894f58e0448be3.zip | |
[Rework] Track maps origins
Diffstat (limited to 'src/libserver/cfg_utils.c')
| -rw-r--r-- | src/libserver/cfg_utils.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c index 78e3fc79f..e2f886aa6 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -2226,12 +2226,9 @@ rspamd_config_get_action_by_type (struct rspamd_config *cfg, } gboolean -rspamd_config_radix_from_ucl (struct rspamd_config *cfg, - const ucl_object_t *obj, - const gchar *description, - struct rspamd_radix_map_helper **target, - GError **err, - struct rspamd_worker *worker) +rspamd_config_radix_from_ucl (struct rspamd_config *cfg, const ucl_object_t *obj, const gchar *description, + struct rspamd_radix_map_helper **target, GError **err, + struct rspamd_worker *worker, const gchar *map_name) { ucl_type_t type; ucl_object_iter_t it = NULL; @@ -2269,7 +2266,8 @@ rspamd_config_radix_from_ucl (struct rspamd_config *cfg, else { /* Just a list */ if (!*target) { - *target = rspamd_map_helper_new_radix (NULL); + *target = rspamd_map_helper_new_radix ( + rspamd_map_add_fake (cfg, description, map_name)); } rspamd_map_helper_insert_radix_resolve (*target, str, ""); @@ -2300,7 +2298,8 @@ rspamd_config_radix_from_ucl (struct rspamd_config *cfg, str = ucl_object_tostring (cur); if (!*target) { - *target = rspamd_map_helper_new_radix (NULL); + *target = rspamd_map_helper_new_radix ( + rspamd_map_add_fake (cfg, description, map_name)); } rspamd_map_helper_insert_radix_resolve (*target, str, ""); @@ -2803,9 +2802,9 @@ rspamd_config_libs (struct rspamd_external_libs_ctx *ctx, if (cfg->local_addrs) { rspamd_config_radix_from_ucl (cfg, cfg->local_addrs, "Local addresses", - (struct rspamd_radix_map_helper **)ctx->local_addrs, + (struct rspamd_radix_map_helper **) ctx->local_addrs, NULL, - NULL); + NULL, "local addresses"); } rspamd_free_zstd_dictionary (ctx->in_dict); |