Merge branch '2.0' into 2.1

Conflicts:
	CMakeLists.txt
	include/modules.h
	include/serialize.h
	modules/commands/bs_assign.cpp
	modules/commands/bs_badwords.cpp
	modules/commands/bs_bot.cpp
	modules/commands/bs_control.cpp
	modules/commands/bs_kick.cpp
	modules/commands/cs_access.cpp
	modules/commands/cs_akick.cpp
	modules/commands/cs_drop.cpp
	modules/commands/cs_entrymsg.cpp
	modules/commands/cs_flags.cpp
	modules/commands/cs_info.cpp
	modules/commands/cs_invite.cpp
	modules/commands/cs_kick.cpp
	modules/commands/cs_mode.cpp
	modules/commands/cs_register.cpp
	modules/commands/cs_seen.cpp
	modules/commands/cs_set.cpp
	modules/commands/cs_suspend.cpp
	modules/commands/cs_topic.cpp
	modules/commands/cs_unban.cpp
	modules/commands/cs_xop.cpp
	modules/commands/hs_del.cpp
	modules/commands/hs_list.cpp
	modules/commands/hs_request.cpp
	modules/commands/ms_ignore.cpp
	modules/commands/ms_send.cpp
	modules/commands/ns_recover.cpp
	modules/commands/ns_register.cpp
	modules/commands/ns_suspend.cpp
	modules/commands/os_dns.cpp
	modules/commands/os_noop.cpp
	modules/commands/os_oper.cpp
	modules/commands/os_session.cpp
	modules/database/db_sql_live.cpp
	modules/encryption/enc_bcrypt.cpp
	modules/extra/m_ldap_authentication.cpp
	modules/extra/m_ldap_oper.cpp
	modules/fantasy.cpp
	modules/m_dnsbl.cpp
	modules/m_sasl.cpp
	modules/protocol/hybrid.cpp
	modules/protocol/inspircd20.cpp
	modules/protocol/unreal.cpp
	modules/pseudoclients/chanserv.cpp
	modules/pseudoclients/nickserv.cpp
	modules/webcpanel/pages/chanserv/access.cpp
	modules/webcpanel/webcpanel.cpp
	modules/webcpanel/webcpanel.h
	src/command.cpp
	src/messages.cpp
	src/modulemanager.cpp
	src/regchannel.cpp
	src/serialize.cpp

6 files changed, 67 insertions, 15 deletions

diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index 6cb44afc3..fbb8f166d 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -10,7 +10,7 @@
  * client, the client becomes no different from a normal service bot, so you will have to use botserv/bot
  * to manually delete the client.
  *
- * You may then waant to map some of the below commands to other services, like placing botserv/bot on
+ * You may then want to map some of the below commands to other services, like placing botserv/bot on
  * OperServ so you can delete the below client, and mapping assign and unassign to ChanServ so users are
  * able to control whether or not ChanServ is in the channel. You may also want to map botserv/set/nobot
  * to OperServ so you can restrict who can assign the other core service clients.
@@ -202,7 +202,7 @@ command { service = "BotServ"; name = "BADWORDS"; command = "botserv/badwords";
  * Used for administrating BotServ bots.
  */
 module { name = "bs_bot" }
-command { service = "BotServ"; name = "BOT"; command = "botserv/bot"; }
+command { service = "BotServ"; name = "BOT"; command = "botserv/bot"; permission = "botserv/bot"; }
 
 /*
  * bs_botlist
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 86b86291b..474d9d052 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -1061,6 +1061,13 @@ module
 	 * If not set, the default is +nt.
 	 */
 	mlock = "+nt"
+
+	/*
+	 * The maximum number of entries that may be on a mode lock list.
+	 *
+	 * This directive is optional.
+	 */
+	max = 32
 }
 command { service = "ChanServ"; name = "MODE"; command = "chanserv/mode"; group = "chanserv/management"; }
 
diff --git a/data/example.conf b/data/example.conf
index f746a2595..a56851b2f 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -447,7 +447,7 @@ options
 
 	/*
 	 * If set, this will allow users to let Services send PRIVMSGs to them
-	 * instead of NOTICEs. Also see the defmsg option of nickserv:defaults,
+	 * instead of NOTICEs. Also see the "msg" option of nickserv:defaults,
 	 * which also toggles the default communication (PRIVMSG or NOTICE) to
 	 * use for unregistered users.
 	 *
@@ -752,7 +752,9 @@ log
  *
  * Available privileges:
  *  botserv/administration        - Can view and assign private BotServ bots
+ *  botserv/fantasy               - Can use fantasy commands without the FANTASIA privilege
  *  chanserv/administration       - Can modify the settings of any channel (including changing of the owner!)
+ *  chanserv/access/list          - Can view channel access and akick lists, but not modify them
  *  chanserv/access/modify        - Can modify channel access and akick lists, and use /chanserv enforce
  *  chanserv/auspex               - Can see any information with /chanserv info
  *  chanserv/no-register-limit    - May register an unlimited number of channels and nicknames
@@ -766,13 +768,14 @@ log
  *  nickserv/confirm              - Can confirm other users nicknames
  *  nickserv/drop                 - Can drop other users nicks
  *  operserv/config               - Can modify services's configuration
+ *  operserv/oper/modify          - Can add and remove operators with at most the same privileges
  *  protected                     - Can not be kicked from channels by Services
  *
  * Available commands:
  *   botserv/bot/del          botserv/bot/add               botserv/bot/change        botserv/set/private
  *   botserv/set/nobot
  *
- *   chanserv/access/list     chanserv/drop                 chanserv/getkey           chanserv/invite
+ *   chanserv/drop            chanserv/getkey               chanserv/invite
  *   chanserv/list            chanserv/suspend              chanserv/topic
  *
  *   chanserv/saset/bantype   chanserv/saset/description    chanserv/saset/email       chanserv/saset/keepmodes
diff --git a/data/memoserv.example.conf b/data/memoserv.example.conf
index 1ab45514e..9f07ec424 100644
--- a/data/memoserv.example.conf
+++ b/data/memoserv.example.conf
@@ -137,7 +137,17 @@ command { service = "MemoServ"; name = "DEL"; command = "memoserv/del"; }
  *
  * Used to ignore memos from specific users.
  */
-module { name = "ms_ignore" }
+module
+{
+	name = "ms_ignore"
+
+	/*
+	 * The maximum number of entries that may be on a memo ignore list.
+	 *
+	 * This directive is optional.
+	 */
+	max = 32
+}
 command { service = "MemoServ"; name = "IGNORE"; command = "memoserv/ignore"; }
 
 /*
diff --git a/data/modules.example.conf b/data/modules.example.conf
index caeddb27d..4d3894bef 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -124,26 +124,58 @@ module { name = "help" }
 		 * %g is the realname of the user
 		 * %h is the hostname of the user
 		 * %i is the IP of the user
-		 * %r is the reason (configured below). Will be nothing if not configured.
+		 * %r is the reply reason (configured below). Will be nothing if not configured.
 		 * %N is the network name set in networkinfo:networkname
 		 */
 		reason = "You are listed in the efnet RBL, visit http://rbl.efnetrbl.org/?i=%i for info"
 
-		/* Replies to ban and their reason. If this is totally omitted all replies get banned. */
-		1 = "Open Proxy"
-		/* Don't ban for result 2 or 3 */
-		#2 = "spamtrap666"
-		#3 = "spamtrap50"
-		4 = "TOR"
-		5 = "Drones / Flooding"
+		/* Replies to ban and their reason. If no relies are configured, all replies get banned. */
+		reply
+		{
+			code = 1
+			reason = "Open Proxy"
+		}
+
+		#reply
+		{
+			code = 2
+			reason = "spamtrap666"
+		}
+
+		#reply
+		{
+			code = 3
+			reason = "spamtrap50"
+		}
+
+		reply
+		{
+			code = 4
+			reason = "TOR"
+
+			/*
+			 * If set, users identified to services at the time the result comes back
+			 * will not be banned.
+			 */
+			#allow_account = yes
+		}
+
+		reply
+		{
+			code = 5
+			reason = "Drones / Flooding"
+		}
 	}
 
-	blacklist
+	#blacklist
 	{
 		name = "dnsbl.dronebl.org"
 		time = 4h
 		reason = "You have a host listed in the DroneBL. For more information, visit http://dronebl.org/lookup_branded?ip=%i&network=%N"
 	}
+
+	/* Exempt localhost from DNSBL checks */
+	exempt { ip = "127.0.0.1" }
 }
 
 /*
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index c81cf0e61..bfbce6013 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -260,7 +260,7 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
 	 */
 	#akillreason = "This network is currently not accepting connections, please try again later."
 }
-#command { service = "OperServ"; name = "DEFCON"; command = "operserv/defcon"; }
+#command { service = "OperServ"; name = "DEFCON"; command = "operserv/defcon"; permission = "operserv/defcon"; }
 
 /*
  * os_dns