aboutsummaryrefslogtreecommitdiffstats
path: root/src/libmime
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-02-15 17:46:19 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-02-15 17:46:19 +0000
commit52a35856a381272acd689f2fc5c16e0e4d14040f (patch)
tree44bbfb98f9c2102130a282ff29691c35d65ca45a /src/libmime
parent7bd1072c639cb767b3afaf2e0575aeb9f988bc97 (diff)
downloadrspamd-52a35856a381272acd689f2fc5c16e0e4d14040f.tar.gz
rspamd-52a35856a381272acd689f2fc5c16e0e4d14040f.zip
Allow && and || in composites.
Diffstat (limited to 'src/libmime')
-rw-r--r--src/libmime/expressions.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libmime/expressions.c b/src/libmime/expressions.c
index d1a5df4e9..07253a2bc 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':