From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 21 Apr 2015 17:06:25 +0000 (+0100)
Subject: Fuzzy actual version is now 3 not 2.
X-Git-Tag: 0.9.0~183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f74ba68df22a4bec9f8b23531aaa5f349c6bb234;p=thirdparty%2Frspamd.git

Fuzzy actual version is now 3 not 2.
---

diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index 77a5b9a55c..22b61256a3 100644
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -214,6 +214,20 @@ rspamd_fuzzy_command_valid (struct rspamd_fuzzy_cmd *cmd, gint r)
 			return (r == sizeof (*cmd));
 		}
 	}
+	else if (cmd->version == 2) {
+		/*
+		 * rspamd 0.8 has slightly different tokenizer then it might be not
+		 * 100% compatible
+		 */
+		if (cmd->shingles_count > 0) {
+			if (r == sizeof (struct rspamd_fuzzy_shingle_cmd)) {
+				return TRUE;
+			}
+		}
+		else {
+			return (r == sizeof (*cmd));
+		}
+	}
 
 	return FALSE;
 }
diff --git a/src/fuzzy_storage.h b/src/fuzzy_storage.h
index b3c65e4cd7..e2803c52ee 100644
--- a/src/fuzzy_storage.h
+++ b/src/fuzzy_storage.h
@@ -6,7 +6,7 @@
 #include "fuzzy.h"
 #include "shingles.h"
 
-#define RSPAMD_FUZZY_VERSION 2
+#define RSPAMD_FUZZY_VERSION 3
 
 /* Commands for fuzzy storage */
 #define FUZZY_CHECK 0