diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-07-14 16:52:33 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-07-14 16:52:33 +0100 |
| commit | 7238b9cfe41d73d90979902f600e55d89908c831 (patch) | |
| tree | 98d6bd55c6ecb1e8ef2d2abd49e72cff331861fb /src/libserver | |
| parent | 98a7518f0b8f5bec20b5995ffcfde079b3fc8138 (diff) | |
| download | rspamd-7238b9cfe41d73d90979902f600e55d89908c831.tar.gz rspamd-7238b9cfe41d73d90979902f600e55d89908c831.zip | |
[Fix] Some fixes to libmagic initialization
Diffstat (limited to 'src/libserver')
| -rw-r--r-- | src/libserver/cfg_file.h | 2 | ||||
| -rw-r--r-- | src/libserver/cfg_rcl.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h index 9e946bfca..a44c2fc4a 100644 --- a/src/libserver/cfg_file.h +++ b/src/libserver/cfg_file.h @@ -370,6 +370,8 @@ struct rspamd_config { gchar * hs_cache_dir; /**< directory to save hyperscan databases */ + gchar * magic_file; /**< file to initialize libmagic */ + gdouble dns_timeout; /**< timeout in milliseconds for waiting for dns reply */ guint32 dns_retransmits; /**< maximum retransmits count */ guint32 dns_throttling_errors; /**< maximum errors for starting resolver throttling */ diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c index b4201fdd9..a099ccda3 100644 --- a/src/libserver/cfg_rcl.c +++ b/src/libserver/cfg_rcl.c @@ -93,7 +93,7 @@ rspamd_rcl_logging_handler (rspamd_mempool_t *pool, const ucl_object_t *obj, GError **err) { const ucl_object_t *val; - const gchar *facility, *log_type, *log_level; + const gchar *facility = NULL, *log_type = NULL, *log_level = NULL; struct rspamd_config *cfg = ud; val = ucl_object_lookup (obj, "type"); @@ -1940,6 +1940,12 @@ rspamd_rcl_config_init (struct rspamd_config *cfg) G_STRUCT_OFFSET (struct rspamd_config, ssl_ciphers), 0, "List of ssl ciphers (e.g. HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4)"); + rspamd_rcl_add_default_handler (sub, + "magic_file", + rspamd_rcl_parse_struct_string, + G_STRUCT_OFFSET (struct rspamd_config, magic_file), + 0, + "Path to a custom libmagic file"); /* New DNS configuration */ ssub = rspamd_rcl_add_section_doc (&sub->subsections, "dns", NULL, NULL, UCL_OBJECT, FALSE, TRUE, |