Move all the parameters around AGAIN. See docs shortly

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

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index a333ea0b0fc6a76329360b3ccabedfe2ec1c8e05..6a5373009f8c14c8f9f4ff3c0b8bf26bec372f71 100644 (file)
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -23,7 +23,7 @@ class PermChannel : public ModeHandler
  public:
        PermChannel(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool sm)
        {
                if (adding)
                {
@@ -37,10 +37,30 @@ class PermChannel : public ModeHandler
                {
                        if (channel->IsModeSet('P'))
                        {
-                               channel->SetMode('P',false);
+                               if (channel->GetUserCounter() == 0 && !sm)
+                               {
+                                       /*
+                                        * ugh, ugh, UGH!
+                                        *
+                                        * We can't delete this channel the way things work at the moment,
+                                        * because of the following scenario:
+                                        * s1:#c <-> s2:#c
+                                        *
+                                        * s1 has a user in #c, s2 does not. s2 has +P set. s2 has a losing TS.
+                                        *
+                                        * On netmerge, s2 loses, so s2 removes all modes (including +P) which
+                                        * would subsequently delete the channel here causing big fucking problems.
+                                        *
+                                        * I don't think there's really a way around this, so just deny -P on a 0 user chan.
+                                        * -- w00t
+                                        *
+                                        * delete channel;
+                                        */
+                                       return MODEACTION_DENY;
+                               }
 
-                               if (channel->GetUserCounter() == 0)
-                                       delete channel;
+                               /* for servers, remove +P (to avoid desyncs) but don't bother trying to delete. */
+                               channel->SetMode('P',false);
                                return MODEACTION_ALLOW;
                        }
                }