From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 4 Aug 2020 09:31:01 +0000 (+0100)
Subject: [Minor] Fix multipattern usage
X-Git-Tag: 2.6~185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6b2789ddd1800b087790a4e873078e489a06bfd;p=thirdparty%2Frspamd.git

[Minor] Fix multipattern usage
---

diff --git a/src/libmime/lang_detection.c b/src/libmime/lang_detection.c
index 9936bedfa0..ba638982df 100644
--- a/src/libmime/lang_detection.c
+++ b/src/libmime/lang_detection.c
@@ -477,17 +477,15 @@ rspamd_language_detector_read_file (struct rspamd_config *cfg,
 				gsize wlen;
 				const char *word = ucl_object_tolstring (w, &wlen);
 				const char *saved;
+				guint mp_flags = RSPAMD_MULTIPATTERN_ICASE|RSPAMD_MULTIPATTERN_UTF8;
+
+				if (rspamd_multipattern_has_hyperscan ()) {
+					mp_flags |= RSPAMD_MULTIPATTERN_RE;
+				}
 
-#ifdef WITH_HYPERSCAN
-				rspamd_multipattern_add_pattern_len (d->stop_words[cat].mp,
-						word, wlen,
-						RSPAMD_MULTIPATTERN_ICASE|RSPAMD_MULTIPATTERN_UTF8
-						|RSPAMD_MULTIPATTERN_RE);
-#else
 				rspamd_multipattern_add_pattern_len (d->stop_words[cat].mp,
 						word, wlen,
-						RSPAMD_MULTIPATTERN_ICASE|RSPAMD_MULTIPATTERN_UTF8);
-#endif
+						mp_flags);
 				nelt->stop_words ++;
 				nstop ++;