[Minor] Nameservers are now raw ucl object

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 8a59f8c74dca5d8b820590880ce3c9499f2a0ba0..a4e7d966c0ca7bc266f1ba4a1e69859d505118d0 100644 (file)
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -360,7 +360,7 @@ struct rspamd_config {
        guint32 dns_throttling_errors;                  /**< maximum errors for starting resolver throttling    */
        guint32 dns_throttling_time;                    /**< time in seconds for DNS throttling                                 */
        guint32 dns_io_per_server;                      /**< number of sockets per DNS server                                   */
-       GList *nameservers;                             /**< list of nameservers or NULL to parse resolv.conf   */
+       const ucl_object_t *nameservers;                /**< list of nameservers or NULL to parse resolv.conf   */
        guint32 dns_max_requests;                       /**< limit of DNS requests per task                                     */
 
        guint upstream_max_errors;                                              /**< upstream max errors before shutting off                    */

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index e33bff15552ed58ec2d70db76a221678f2945294..6bbbcfd35de30414984099b2df3619207422d11d 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1607,7 +1607,7 @@ rspamd_rcl_config_init (struct rspamd_config *cfg)
        /* Old DNS configuration */
        rspamd_rcl_add_default_handler (sub,
                        "dns_nameserver",
-                       rspamd_rcl_parse_struct_string_list,
+                       rspamd_rcl_parse_struct_ucl,
                        G_STRUCT_OFFSET (struct rspamd_config, nameservers),
                        0,
                        "Legacy option for DNS servers used");
@@ -1846,13 +1846,13 @@ rspamd_rcl_config_init (struct rspamd_config *cfg)
                        "Options for DNS resolver");
        rspamd_rcl_add_default_handler (ssub,
                        "nameserver",
-                       rspamd_rcl_parse_struct_string_list,
+                       rspamd_rcl_parse_struct_ucl,
                        G_STRUCT_OFFSET (struct rspamd_config, nameservers),
                        0,
                        "List of DNS servers");
        rspamd_rcl_add_default_handler (ssub,
                        "server",
-                       rspamd_rcl_parse_struct_string_list,
+                       rspamd_rcl_parse_struct_ucl,
                        G_STRUCT_OFFSET (struct rspamd_config, nameservers),
                        0,
                        "List of DNS servers");