1 files changed, 8 insertions, 39 deletions

diff --git a/test/functional/configs/whitelist.conf b/test/functional/configs/whitelist.conf
index 9b8c3af63..7769f5cd4 100644
--- a/test/functional/configs/whitelist.conf
+++ b/test/functional/configs/whitelist.conf
@@ -3,16 +3,6 @@ dmarc {}
 whitelist {
 
   rules {
-        "BLACKLIST_DDS" = {
-            blacklist = true;
-            valid_dkim = true;
-            valid_dmarc = true;
-            valid_spf = true;
-            domains = [
-                "${TESTDIR}/configs/maps/domains.list",
-            ];
-            score = 3.0
-        }
 
         "WHITELIST_DDS" = {
             valid_dkim = true;
@@ -21,7 +11,8 @@ whitelist {
             domains = [
                 "${TESTDIR}/configs/maps/domains.list",
             ];
-            score = -3.0
+            score = -3.0;
+            inverse_symbol = "BLACKLIST_DDS";
         }
 
         "WHITELIST_DKIM" = {
@@ -30,16 +21,8 @@ whitelist {
                 "${TESTDIR}/configs/maps/domains.list",
             ];
             description = "Mail comes from the whitelisted domain and has a valid DKIM signature";
-            score = -1.0
-        }
-
-        "BLACKLIST_DKIM" = {
-            blacklist = true;
-            valid_dkim = true;
-            domains = [
-                "${TESTDIR}/configs/maps/domains.list",
-            ];
-            score = 3.0
+            score = -1.0;
+            inverse_symbol = "BLACKLIST_DKIM";
         }
 
         "WHITELIST_SPF" = {
@@ -48,16 +31,9 @@ whitelist {
                 "${TESTDIR}/configs/maps/domains.list",
             ];
             score = -1.0
+            inverse_multiplier = 3.0
             description = "Mail comes from the whitelisted domain and has a valid SPF policy";
-        }
-
-        "BLACKLIST_SPF" = {
-            blacklist = true;
-            valid_spf = true;
-            domains = [
-                "${TESTDIR}/configs/maps/domains.list",
-            ];
-            score = 3.0
+            inverse_symbol = "BLACKLIST_SPF";
         }
 
         "WHITELIST_DMARC_DKIM" = {
@@ -68,6 +44,7 @@ whitelist {
             ];
             score = -2.0;
             description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies";
+            inverse_symbol = "BLACKLIST_DMARC_DKIM";
         }
 
         "WHITELIST_DMARC" = {
@@ -77,15 +54,7 @@ whitelist {
             ];
             score = -2.0;
             description = "Mail comes from the whitelisted domain and has valid DMARC policy";
-        }
-
-        "BLACKLIST_DMARC" = {
-            blacklist = true;
-            valid_dmarc = true;
-            domains = [
-                "${TESTDIR}/configs/maps/domains.list",
-            ];
-            score = 3.0;
+            inverse_symbol = "BLACKLIST_DMARC";
         }
 
         "STRICT_DMARC" = {