From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 15 Feb 2015 17:46:19 +0000 (+0000)
Subject: Allow && and || in composites.
X-Git-Tag: 0.9.0~697
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52a35856a381272acd689f2fc5c16e0e4d14040f;p=thirdparty%2Frspamd.git

Allow && and || in composites.
---

diff --git a/src/libmime/expressions.c b/src/libmime/expressions.c
index d1a5df4e9d..07253a2bc5 100644
--- a/src/libmime/expressions.c
+++ b/src/libmime/expressions.c
@@ -256,7 +256,13 @@ op_to_char (gchar *a, gchar **next)
 	case '|':
 	case '(':
 	case ')':
-		*next = a + 1;
+		if ((a[0] == '&' && a[1] == '&') ||
+				(a[0] == '|' && a[1] == '|')) {
+			*next = a + 2;
+		}
+		else {
+			*next = a + 1;
+		}
 		return *a;
 	case 'O':
 	case 'o':