From ea84004410bb1911d42608d99f9073d9d9a064f3 Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@users.noreply.github.com>
Date: Fri, 25 May 2018 18:58:37 +0200
Subject: [PATCH] [rspamd] fix redis multimaps in version 1.7.5

The key's value was being used as symbol name instead of the symbol name defined in the config file
---
 data/conf/rspamd/local.d/multimap.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf
index d96f6bf8..da4afaf2 100644
--- a/data/conf/rspamd/local.d/multimap.conf
+++ b/data/conf/rspamd/local.d/multimap.conf
@@ -2,29 +2,34 @@ RCPT_MAILCOW_DOMAIN {
   type = "rcpt";
   filter = "email:domain";
   map = "redis://DOMAIN_MAP";
+  symbols_set = ["RCPT_MAILCOW_DOMAIN"];
 }
 
 RCPT_WANTS_SUBJECT_TAG {
   type = "rcpt";
   filter = "email:addr";
   map = "redis://RCPT_WANTS_SUBJECT_TAG";
+  symbols_set = ["RCPT_WANTS_SUBJECT_TAG"];
 }
 
 RCPT_WANTS_SUBFOLDER_TAG {
   type = "rcpt";
   filter = "email:addr";
   map = "redis://RCPT_WANTS_SUBFOLDER_TAG";
+  symbols_set = ["RCPT_WANTS_SUBFOLDER_TAG"];
 }
 
 WHITELISTED_FWD_HOST {
   type = "ip";
   map = "redis://WHITELISTED_FWD_HOST";
+  symbols_set = ["WHITELISTED_FWD_HOST"];
 }
 
 KEEP_SPAM {
   type = "ip";
   map = "redis://KEEP_SPAM";
   action = "accept";
+  symbols_set = ["KEEP_SPAM"];
 }
 
 LOCAL_BL_ASN {
@@ -33,6 +38,7 @@ LOCAL_BL_ASN {
   map = "$LOCAL_CONFDIR/custom/bad_asn.map";
   score = 5;
   description = "Sender's ASN is on the local blacklist";
+  symbols_set = ["LOCAL_BL_ASN"];
 }
 
 #SPOOFED_SENDER {
@@ -40,4 +46,5 @@ LOCAL_BL_ASN {
 #  filter = "email:domain:tld";
 #  map = "redis://DOMAIN_MAP";
 #  require_symbols = "AUTH_NA | !RCVD_VIA_SMTP_AUTH";
+#  symbols_set = ["SPOOFED_SENDER"];
 #}