From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 28 Apr 2015 14:25:10 +0000 (+0100)
Subject: Try to guess url_tld if it is not specified.
X-Git-Tag: 0.9.0~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b64cb0ef4685038fff4e902d592fcbe9937c3abf;p=thirdparty%2Frspamd.git

Try to guess url_tld if it is not specified.
---

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 450bde0a71..9009145352 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -383,6 +383,27 @@ rspamd_config_post_load (struct rspamd_config *cfg)
 
 	cfg->default_metric = def_metric;
 
+	if (cfg->tld_file == NULL) {
+		/* Try to guess tld file */
+		GString *fpath = g_string_new (NULL);
+
+		rspamd_printf_gstring (fpath, "%s%c%s", RSPAMD_PLUGINSDIR,
+				G_DIR_SEPARATOR, "effective_tld_names.dat");
+
+		if (access (fpath->str, R_OK)) {
+			msg_warn ("url_tld option is not specified but %s is available,"
+					" therefore this file is assumed as TLD file for URL"
+					" extraction", fpath->str);
+			cfg->tld_file = rspamd_mempool_strdup (cfg->cfg_pool, fpath->str);
+		}
+		else {
+			msg_err ("no url_tld option has been specified, URL's detection "
+					"will be awfully broken");
+		}
+
+		g_string_free (fpath, TRUE);
+	}
+
 	/* Lua options */
 	(void)rspamd_lua_post_load_config (cfg);
 	init_dynamic_config (cfg);