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, 6 insertions, 0 deletions

diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index ae4a291a0..6f1f0f1f0 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -162,6 +162,7 @@ class CommandCSAccess : public Command
 		else
 		{
 			na = NickServ::FindNick(mask);
+
 			if (!na && Config->GetModule("chanserv")->Get<bool>("disallow_hostmask_access"))
 			{
 				source.Reply(_("Masks and unregistered users may not be on access lists."));
@@ -179,6 +180,9 @@ class CommandCSAccess : public Command
 					return;
 				}
 			}
+
+			if (na)
+				mask = na->GetNick();
 		}
 
 		for (unsigned i = ci->GetAccessCount(); i > 0; --i)
@@ -502,6 +506,8 @@ class CommandCSAccess : public Command
 		bool has_access = false;
 		if (source.HasPriv("chanserv/access/modify"))
 			has_access = true;
+		else if (is_list && source.HasPriv("chanserv/access/list"))
+			has_access = true;
 		else if (is_list && source.AccessFor(ci).HasPriv("ACCESS_LIST"))
 			has_access = true;
 		else if (source.AccessFor(ci).HasPriv("ACCESS_CHANGE"))