aboutsummaryrefslogtreecommitdiffstats
path: root/src/libserver
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2020-02-25 17:01:00 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2020-02-25 17:01:00 +0000
commit4184776a1744bfa1e73eac80e8126573d8aae0f0 (patch)
tree918cbd83df5a16eb4d88ce0b493dc71a171b67e6 /src/libserver
parenta8d97d481aea7fc2acc88055c82431d5e736c817 (diff)
downloadrspamd-4184776a1744bfa1e73eac80e8126573d8aae0f0.tar.gz
rspamd-4184776a1744bfa1e73eac80e8126573d8aae0f0.zip
[Fix] Fix tld compositon rules
Issue: #3248, #3268
Diffstat (limited to 'src/libserver')
-rw-r--r--src/libserver/url.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libserver/url.c b/src/libserver/url.c
index dcf13cfda..0407490d8 100644
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -442,7 +442,6 @@ rspamd_url_parse_tld_file (const gchar *fname,
flags = URL_FLAG_NOHTML | URL_FLAG_TLD_MATCH;
-#ifndef WITH_HYPERSCAN
if (linebuf[0] == '*') {
flags |= URL_FLAG_STAR_MATCH;
p = strchr (linebuf, '.');
@@ -456,9 +455,6 @@ rspamd_url_parse_tld_file (const gchar *fname,
else {
p = linebuf;
}
-#else
- p = linebuf;
-#endif
m.flags = flags;
rspamd_multipattern_add_pattern (url_scanner->search_trie, p,
@@ -1553,6 +1549,9 @@ rspamd_tld_trie_callback (struct rspamd_multipattern *mp,
ndots--;
pos = p + 1;
}
+ else {
+ pos = p;
+ }
p--;
}