X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=1f2fe745531f9e4a7463b790a9c3e37f7b0b2141;hb=ec6955f28ba9423828ac24ef83caee09ffa6b52c;hp=0b708641e9124219ce66a5f9855c7f763a3b6e38;hpb=e191f0ed6cdca421407ebc67c28fafabc6cc63f7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 0b708641e..1f2fe7455 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -39,29 +39,27 @@ class ModuleModesOnConnect : public Module
 	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
 	{
 		// Backup and zero out the disabled usermodes, so that we can override them here.
-		char save[64];
-		memcpy(save, ServerInstance->Config->DisabledUModes,
-				sizeof(ServerInstance->Config->DisabledUModes));
-		memset(ServerInstance->Config->DisabledUModes, 0, 64);
+		const std::bitset<64> save = ServerInstance->Config->DisabledUModes;
+		ServerInstance->Config->DisabledUModes.reset();
 
 		ConfigTag* tag = user->MyClass->config;
 		std::string ThisModes = tag->getString("modes");
 		if (!ThisModes.empty())
 		{
 			std::string buf;
-			std::stringstream ss(ThisModes);
+			irc::spacesepstream ss(ThisModes);
 
-			std::vector<std::string> modes;
+			CommandBase::Params modes;
 			modes.push_back(user->nick);
 
 			// split ThisUserModes into modes and mode params
-			while (ss >> buf)
+			while (ss.GetToken(buf))
 				modes.push_back(buf);
 
 			ServerInstance->Parser.CallHandler("MODE", modes, user);
 		}
 
-		memcpy(ServerInstance->Config->DisabledUModes, save, 64);
+		ServerInstance->Config->DisabledUModes = save;
 	}
 };