Fix IPv6 cloaking in compatability mode (was using the wrong xtab confusor)

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 175e188618d6d11e5d5fc29cccb5b906178f979d..61026c08f5d0cdbfb4f6ba91eebb4d7ee903f3d5 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -20,9 +20,8 @@
  */
 class Channel_r : public ModeHandler
 {
-
  public:
-       Channel_r(Module* Creator) : ModeHandler(Creator, "registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { }
+       Channel_r(Module* Creator) : ModeHandler(Creator, "c_registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -52,7 +51,7 @@ class User_r : public ModeHandler
 {
 
  public:
-       User_r(Module* Creator) : ModeHandler(Creator, "registered", 'r', PARAM_NONE, MODETYPE_USER) { }
+       User_r(Module* Creator) : ModeHandler(Creator, "u_registered", 'r', PARAM_NONE, MODETYPE_USER) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -176,8 +175,7 @@ class ModuleServicesAccount : public Module
                if (target_type == TYPE_CHANNEL)
                {
                        Channel* c = (Channel*)dest;
-                       ModResult res;
-                       FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"regmoderated"));
+                       ModResult res = ServerInstance->OnCheckExemption(user,c,"regmoderated");
 
                        if (c->IsModeSet('M') && !is_registered && res != MOD_RES_ALLOW)
                        {