Merge pull request #1361 from genius3000/master+rline_IP

[user/henk/code/inspircd.git] / src / modules / m_conn_umodes.cpp

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 0b708641e9124219ce66a5f9855c7f763a3b6e38..acac7640adf0149ce1ecf4117e83d387469ee671 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -39,10 +39,8 @@ 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");
@@ -61,7 +59,7 @@ class ModuleModesOnConnect : public Module
                        ServerInstance->Parser.CallHandler("MODE", modes, user);
                }
 
-               memcpy(ServerInstance->Config->DisabledUModes, save, 64);
+               ServerInstance->Config->DisabledUModes = save;
        }
 };