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

3 files changed, 10 insertions, 14 deletions

diff --git a/modules/pseudoclients/botserv/botserv.cpp b/modules/pseudoclients/botserv/botserv.cpp
index 692194990..0042b6267 100644
--- a/modules/pseudoclients/botserv/botserv.cpp
+++ b/modules/pseudoclients/botserv/botserv.cpp
@@ -69,12 +69,12 @@ class BotServCore : public Module, public BotServ::BotServService
 		ServiceBot *bi = user->server == Me ? dynamic_cast<ServiceBot *>(user) : NULL;
 		if (bi && Config->GetModule(this)->Get<bool>("smartjoin"))
 		{
-			std::pair<Channel::ModeList::iterator, Channel::ModeList::iterator> bans = c->GetModeList("BAN");
+			std::vector<Anope::string> bans = c->GetModeList("BAN");
 
 			/* We check for bans */
-			for (; bans.first != bans.second; ++bans.first)
+			for (unsigned int i = 0; i < bans.size(); ++i)
 			{
-				Entry ban("BAN", bans.first->second);
+				Entry ban("BAN", bans[i]);
 				if (ban.Matches(user))
 					c->RemoveMode(NULL, "BAN", ban.GetMask());
 			}
diff --git a/modules/pseudoclients/chanserv/chanserv.cpp b/modules/pseudoclients/chanserv/chanserv.cpp
index ec5fcb648..3bab894e9 100644
--- a/modules/pseudoclients/chanserv/chanserv.cpp
+++ b/modules/pseudoclients/chanserv/chanserv.cpp
@@ -529,10 +529,6 @@ class ChanServCore : public Module
 		if (inhabit.HasExt(c))
 			return EVENT_STOP;
 
-		/* Channel is persistent, it shouldn't be deleted and the service bot should stay */
-		if (c->ci && persist && persist->Get(c->ci))
-			return EVENT_STOP;
-
 		return EVENT_CONTINUE;
 	}
 
@@ -543,7 +539,7 @@ class ChanServCore : public Module
 		/* Find all persistent channels and create them, as we are about to finish burst to our uplink */
 		for (ChanServ::Channel *ci : channel_type.List<ChanServ::Channel *>())
 		{
-			if (persist->Get(ci))
+			if (persist->HasExt(ci))
 			{
 				bool c;
 				ci->c = Channel::FindOrCreate(ci->GetName(), c, ci->GetTimeRegistered());
@@ -577,7 +573,7 @@ class ChanServCore : public Module
 		if (ci->c->HasMode("PERM"))
 			persist->Set(ci, true);
 		/* Persist may be in def cflags, set it here */
-		else if (persist->Get(ci))
+		else if (persist->HasExt(ci))
 			ci->c->SetMode(NULL, "PERM");
 	}
 
diff --git a/modules/pseudoclients/nickserv/nickserv.cpp b/modules/pseudoclients/nickserv/nickserv.cpp
index 3ed68d2ec..ee6068ef1 100644
--- a/modules/pseudoclients/nickserv/nickserv.cpp
+++ b/modules/pseudoclients/nickserv/nickserv.cpp
@@ -276,16 +276,15 @@ class NickServCore : public Module, public NickServ::NickServService
 			while (User::Find(guestnick) && i++ < 10);
 
 			if (i == 11)
-				u->Kill(NickServ ? NickServ->nick : "", "Services nickname-enforcer kill");
+				u->Kill(*NickServ, "Services nickname-enforcer kill");
 			else
 			{
-				if (NickServ)
-					u->SendMessage(*NickServ, _("Your nickname is now being changed to \002%s\002"), guestnick.c_str());
+				u->SendMessage(*NickServ, _("Your nickname is now being changed to \002%s\002"), guestnick.c_str());
 				IRCD->SendForceNickChange(u, guestnick, Anope::CurTime);
 			}
 		}
 		else
-			u->Kill(NickServ ? NickServ->nick : "", "Services nickname-enforcer kill");
+			u->Kill(*NickServ, "Services nickname-enforcer kill");
 	}
 
 	void Release(NickServ::Nick *na) override
@@ -305,6 +304,7 @@ class NickServCore : public Module, public NickServ::NickServService
 
 			held.Unset(na);
 		}
+		collided.Unset(na); /* clear pending collide */
 	}
 
 	NickServ::IdentifyRequest *CreateIdentifyRequest(NickServ::IdentifyRequestListener *l, Module *o, const Anope::string &acc, const Anope::string &pass) override
@@ -502,7 +502,7 @@ class NickServCore : public Module, public NickServ::NickServService
 			IRCD->SendLogin(u, na);
 			if (!Config->GetModule("nickserv")->Get<bool>("nonicknameownership") && na->GetAccount() == u->Account() && !na->GetAccount()->HasFieldS("UNCONFIRMED"))
 				u->SetMode(NickServ, "REGISTERED");
-			Log(NickServ) << u->GetMask() << " automatically identified for group " << u->Account()->GetDisplay();
+			Log(u, "", NickServ) << u->GetMask() << " automatically identified for group " << u->Account()->GetDisplay();
 		}
 
 		if (!u->nick.equals_ci(oldnick) && old_na)