- Added basic support for libGeoIP

- Added exempt configuration option to resv{} blocks


git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1858 82007160-df01-0410-b94d-b575c5fd34c7

1 files changed, 25 insertions, 15 deletions

diff --git a/doc/reference.conf b/doc/reference.conf
index 66901ba..eebc917 100644
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -710,15 +710,31 @@ exempt {
 /*
  * resv {}:  nicks and channels users may not use/join
  */
-resv { nick = "clone*"; reason = "Clone bots"; };
-resv { nick = "NickServ"; reason = "Reserved for services"; };
-resv { nick = "OperServ"; reason = "Reserved for services"; };
-resv { nick = "MemoServ"; reason = "Reserved for services"; };
-resv { nick = "BotServ"; reason = "Reserved for services"; };
-resv { nick = "HelpServ"; reason = "Reserved for services"; };
-resv { nick = "HostServ"; reason = "Reserved for services"; };
-resv { nick = "StatServ"; reason = "Reserved for services"; };
-resv { channel = "#*services*"; reason = "Reserved for services"; };
+resv { mask = "clone*"; reason = "Clone bots"; };
+resv { mask = "NickServ"; reason = "Reserved for services"; };
+resv { mask = "OperServ"; reason = "Reserved for services"; };
+resv { mask = "MemoServ"; reason = "Reserved for services"; };
+resv { mask = "BotServ"; reason = "Reserved for services"; };
+resv { mask = "HelpServ"; reason = "Reserved for services"; };
+resv { mask = "HostServ"; reason = "Reserved for services"; };
+resv { mask = "StatServ"; reason = "Reserved for services"; };
+resv { mask = "#*services*"; reason = "Reserved for services"; };
+
+resv {
+	/*
+	 * mask: masks starting with a '#' are automatically considered
+	 * as channel name mask
+	 */
+	mask = "#helsinki";
+	reason = "Channel is reserved for finnish inhabitants";
+
+	/*
+	 * exempt: can be either a ISO 3166 alpha-2 two letter country
+	 * code, or a nick!user@host mask. CIDR is supported. Exempt
+	 * entries can be stacked.
+	 */
+	exempt = "FI";
+};
 
 /*
  * gecos {}:  The X: replacement, used for banning users based on
@@ -764,12 +780,6 @@ channel {
 	disable_fake_channels = yes;
 
 	/*
-	 * restrict_channels: reverse channel RESVs logic, only reserved
-	 * channels are allowed
-	 */
-	restrict_channels = no;
-
-	/*
 	 * knock_delay: The amount of time a user must wait between issuing
 	 * the knock command.
 	 */