From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 19 Jan 2016 14:27:11 +0000 (+0000)
Subject: Fix duplicated XBL symbol
X-Git-Tag: 1.1.1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb0fdaef3726861673e85062f02a797a2fdf5f1;p=thirdparty%2Frspamd.git

Fix duplicated XBL symbol
---

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 093d00e335..309fa15f5a 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -568,15 +568,30 @@ metric {
 	    weight = 4.0;
 	    description = "From address is listed in zen xbl";
 	}
+	symbol {
+	    name = "RBL_SPAMHAUS_XBL1";
+	    weight = 4.0;
+	    description = "From address is listed in zen xbl (obsoleted/reserved)";
+	}
+	symbol {
+	    name = "RBL_SPAMHAUS_XBL2";
+	    weight = 4.0;
+	    description = "From address is listed in zen xbl (obsoleted/reserved)";
+	}
+	symbol {
+	    name = "RBL_SPAMHAUS_XBL3";
+	    weight = 4.0;
+	    description = "From address is listed in zen xbl (reserved)";
+	}
 	symbol {
 	    name = "RBL_SPAMHAUS_PBL";
 	    weight = 2.0;
-	    description = "From address is listed in zen pbl";
+	    description = "From address is listed in zen pbl (ISP list)";
 	}
 	symbol {
 	    name = "RBL_SPAMHAUS_PBL1";
 	    weight = 2.0;
-	    description = "From address is listed in zen pbl";
+	    description = "From address is listed in zen pbl (Spamhaus list)";
 	}
 	symbol {
 	    name = "RECEIVED_SPAMHAUS_XBL";
diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index 5e12be7744..bcb47c4842 100644
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -15,9 +15,9 @@ rbl {
                 RBL_SPAMHAUS_SBL = "127.0.0.2";
                 RBL_SPAMHAUS_CSS = "127.0.0.3";
                 RBL_SPAMHAUS_XBL = "127.0.0.4";
-                RBL_SPAMHAUS_XBL = "127.0.0.5";
-                RBL_SPAMHAUS_XBL = "127.0.0.6";
-                RBL_SPAMHAUS_XBL = "127.0.0.7";
+                RBL_SPAMHAUS_XBL1 = "127.0.0.5";
+                RBL_SPAMHAUS_XBL2 = "127.0.0.6";
+                RBL_SPAMHAUS_XBL3 = "127.0.0.7";
                 RBL_SPAMHAUS_PBL = "127.0.0.10";
                 RBL_SPAMHAUS_PBL1 = "127.0.0.11";
             }