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

1 files changed, 7 insertions, 5 deletions

diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp
index 08da7537f..8cd1f778a 100644
--- a/modules/commands/cs_akick.cpp
+++ b/modules/commands/cs_akick.cpp
@@ -195,10 +195,10 @@ class CommandCSAKick : public Command
 		/* Check excepts BEFORE we get this far */
 		if (ci->c)
 		{
-			std::pair<Channel::ModeList::iterator, Channel::ModeList::iterator> modes = ci->c->GetModeList("EXCEPT");
-			for (; modes.first != modes.second; ++modes.first)
+			std::vector<Anope::string> modes = ci->c->GetModeList("EXCEPT");
+			for (unsigned int i = 0; i < modes.size(); ++i)
 			{
-				if (Anope::Match(modes.first->second, mask))
+				if (Anope::Match(modes[i], mask))
 				{
 					source.Reply(_("\002{0}\002 matches an except on \002{1}\002 and cannot be banned until the except has been removed."), mask, ci->GetName());
 					return;
@@ -547,19 +547,21 @@ class CommandCSAKick : public Command
 			return;
 		}
 
+		bool is_list = cmd.equals_ci("LIST") || cmd.equals_ci("VIEW");
+		
 		if (mask.empty() && (cmd.equals_ci("ADD") || cmd.equals_ci("DEL")))
 		{
 			this->OnSyntaxError(source, cmd);
 			return;
 		}
 
-		if (!source.AccessFor(ci).HasPriv("AKICK") && !source.HasPriv("chanserv/access/modify"))
+		if (!source.AccessFor(ci).HasPriv("AKICK") && !source.HasPriv("chanserv/access/modify") && (!is_list || source.HasPriv("chanserv/access/list")))
 		{
 			source.Reply(_("Access denied. You do not have privilege \002{0}\002 on \002{1}\002."), "AKICK", ci->GetName());
 			return;
 		}
 
-		if (Anope::ReadOnly && (cmd.equals_ci("ADD") || cmd.equals_ci("DEL")))
+		if (Anope::ReadOnly && (cmd.equals_ci("ADD") || cmd.equals_ci("DEL") || cmd.equals_ci("CLEAR")))
 		{
 			source.Reply(_("Sorry, channel autokick list modification is temporarily disabled."));
 			return;