Merge pull request #591 from SaberUK/master+config-tweaks

Various patches relating to configuration.

1 files changed, 3 insertions, 12 deletions

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index c730602a1..36e10ec5b 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -43,18 +43,9 @@ class ModuleConnectBan : public Module
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("connectban");
 
-		ipv4_cidr = tag->getInt("ipv4cidr", 32);
-		if (ipv4_cidr == 0)
-			ipv4_cidr = 32;
-
-		ipv6_cidr = tag->getInt("ipv6cidr", 128);
-		if (ipv6_cidr == 0)
-			ipv6_cidr = 128;
-
-		threshold = tag->getInt("threshold", 10);
-		if (threshold == 0)
-			threshold = 10;
-
+		ipv4_cidr = tag->getInt("ipv4cidr", 32, 1, 32);
+		ipv6_cidr = tag->getInt("ipv6cidr", 128, 1, 128);
+		threshold = tag->getInt("threshold", 10, 1);
 		banduration = InspIRCd::Duration(tag->getString("duration", "10m"));
 		if (banduration == 0)
 			banduration = 10*60;