From 57b8cb0fcf81cab047ffe0c762e7f6cba5b790e5 Mon Sep 17 00:00:00 2001
From: nenolod <devnull@localhost>
Date: Sat, 26 May 2007 22:35:06 -0700
Subject: [PATCH] [svn] - blacklist{}: add notes about DroneBL and enable it by
 default. AHBL is still not enabled by default due   to their policies
 indicating that they wish to be contacted before their services are used.

---
 ChangeLog          |  9 +++++++++
 doc/example.conf   | 11 +++++++----
 doc/reference.conf | 11 +++++++----
 include/serno.h    |  2 +-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0aee431e..848eecbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+nenolod     2007/05/27 05:30:41 UTC	(20070527-3480)
+  Log:
+  - update NEWS in preparation of upcoming 2.2 release this week
+  
+
+  Changes:	Modified:
+  +3 -0		trunk/NEWS (File Modified) 
+
+
 jilles      2007/05/24 15:10:06 UTC	(20070524-3478)
   Log:
   Move sno_channeljoin to unsupported, due to the privacy
diff --git a/doc/example.conf b/doc/example.conf
index b1843c53..84575e22 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -4,7 +4,7 @@
  * Copyright (C) 2002-2005 ircd-ratbox development team
  * Copyright (C) 2005-2006 charybdis development team
  *
- * $Id: example.conf 3478 2007-05-24 15:10:06Z jilles $
+ * $Id: example.conf 3482 2007-05-27 05:35:06Z nenolod $
  *
  * See reference.conf for more information.
  */
@@ -310,17 +310,20 @@ serverhide {
  *   ${nick}         - the user's nickname
  *   ${network-name} - the name of the network
  *
- * Note: AHBL (the providers of the below BLs) request that they be
+ * Note: AHBL (the providers of the below *.ahbl.org BLs) request that they be
  * contacted, via email, at admins@2mbit.com before using these BLs.
  * See <http://www.ahbl.org/services.php> for more information.
  */
-#blacklist {
+blacklist {
+	host = "dnsbl.dronebl.org";
+	reject_reason = "${nick}, your IP (${ip}) is listed in DroneBL. For assistance, see http://dronebl.org/lookup_branded.do?ip=${ip}&network=${network-name}";
+
 #	host = "ircbl.ahbl.org";
 #	reject_reason = "${nick}, your IP (${ip}) is listed in ${dnsbl-host} for having an open proxy. In order to protect ${network-name} from abuse, we are not allowing connections with open proxies to connect.";
 #
 #	host = "tor.ahbl.org";
 #	reject_reason = "${nick}, your IP (${ip}) is listed as a TOR exit node. In order to protect ${network-name} from tor-based abuse, we are not allowing TOR exit nodes to connect to our network.";
-#};
+};
 
 alias "NickServ" {
 	target = "NickServ";
diff --git a/doc/reference.conf b/doc/reference.conf
index 70acd4f0..c2b98ae5 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -6,7 +6,7 @@
  *
  * Written by ejb, wcampbel, db, leeh and others
  *
- * $Id: reference.conf 3478 2007-05-24 15:10:06Z jilles $
+ * $Id: reference.conf 3482 2007-05-27 05:35:06Z nenolod $
  */
 
 /* IMPORTANT NOTES:
@@ -696,17 +696,20 @@ serverhide {
  *   ${nick}         - the user's nickname
  *   ${network-name} - the name of the network
  *
- * Note: AHBL (the providers of the below BLs) request that they be
+ * Note: AHBL (the providers of the below *.ahbl.org BLs) request that they be
  * contacted, via email, at admins@2mbit.com before using these BLs.
  * See <http://www.ahbl.org/services.php> for more information.
  */
-#blacklist {
+blacklist {
+	host = "dnsbl.dronebl.org";
+	reject_reason = "${nick}, your IP (${ip}) is listed in DroneBL. For assistance, see http://dronebl.org/lookup_branded.do?ip=${ip}&network=${network-name}";
+
 #	host = "ircbl.ahbl.org";
 #	reject_reason = "${nick}, your IP (${ip}) is listed in ${dnsbl-host} for having an open proxy. In order to protect ${network-name} from abuse, we are not allowing connections with open proxies to connect.";
 #
 #	host = "tor.ahbl.org";
 #	reject_reason = "${nick}, your IP (${ip}) is listed as a TOR exit node. In order to protect ${network-name} from tor-based abuse, we are not allowing TOR exit nodes to connect to our network.";
-#};
+};
 
 /*
  * Alias blocks allow you to define custom commands. (Old m_sshortcut.c)
diff --git a/include/serno.h b/include/serno.h
index 8d726e9e..e398dde7 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070524-3478"
+#define SERNO "20070527-3480"