diff options
| -rw-r--r-- | include/base.h | 2 | ||||
| -rw-r--r-- | src/modes/cmode_o.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_chanprotect.cpp | 21 |
3 files changed, 24 insertions, 2 deletions
diff --git a/include/base.h b/include/base.h index e41f520f5..2289fa5e0 100644 --- a/include/base.h +++ b/include/base.h @@ -79,7 +79,7 @@ public: */ return this->Extension_Items.insert(std::make_pair(key, (char*)p)).second; } - + /** Extend an Extensible class. * * @param key The key parameter is an arbitary string which identifies the extension data diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp index a24cc2af9..e75e551b2 100644 --- a/src/modes/cmode_o.cpp +++ b/src/modes/cmode_o.cpp @@ -101,8 +101,11 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in if (IS_LOCAL(user)) { int MOD_RESULT = 0; + log(DEBUG,"Call OnAccessCheck for AC_DEOP"); FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP)); + log(DEBUG,"Returns %d",MOD_RESULT); + if (MOD_RESULT == ACR_DENY) return ""; if (MOD_RESULT == ACR_DEFAULT) diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 14b0f82b4..a4bbeee14 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -61,9 +61,12 @@ class ChanFounder : public ModeHandler { userrec* theuser = Srv->FindNick(parameter); + log(DEBUG,"ChanFounder::OnModeChange"); + // cant find the user given as the parameter, eat the mode change. if (!theuser) { + log(DEBUG,"No such user in ChanFounder"); parameter = ""; return MODEACTION_DENY; } @@ -71,6 +74,7 @@ class ChanFounder : public ModeHandler // given user isnt even on the channel, eat the mode change if (!channel->HasUser(theuser)) { + log(DEBUG,"Channel doesn't have user in ChanFounder"); parameter = ""; return MODEACTION_DENY; } @@ -81,13 +85,20 @@ class ChanFounder : public ModeHandler // source is a server, or ulined, we'll let them +-q the user. if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server) || (!IS_LOCAL(source))) { + log(DEBUG,"Allowing remote mode change in ChanFounder"); if (adding) { if (!theuser->GetExt(founder,dummyptr)) { - theuser->Extend(founder,fakevalue); + log(DEBUG,"Does not have the ext item in ChanFounder"); + if (!theuser->Extend(founder,fakevalue)) + log(DEBUG,"COULD NOT EXTEND!!!"); // Tidy the nickname (make case match etc) parameter = theuser->nick; + if (theuser->GetExt(founder, dummyptr)) + log(DEBUG,"Extended!"); + else + log(DEBUG,"Not extended :("); return MODEACTION_ALLOW; } } @@ -321,6 +332,7 @@ class ModuleChanProtect : public Module // etc of protected users. There are many types of access check, we're going to handle // a relatively small number of them relevent to our module using a switch statement. + log(DEBUG,"chanprotect OnAccessCheck %d",access_type); // don't allow action if: // (A) Theyre founder (no matter what) // (B) Theyre protected, and you're not @@ -342,11 +354,17 @@ class ModuleChanProtect : public Module { // a user has been deopped. Do we let them? hmmm... case AC_DEOP: + log(DEBUG,"OnAccessCheck AC_DEOP"); if (dest->GetExt(founder,dummyptr)) { + log(DEBUG,"Has %s",founder.c_str()); Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } + else + { + log(DEBUG,"Doesnt have %s",founder.c_str()); + } if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) { Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); @@ -356,6 +374,7 @@ class ModuleChanProtect : public Module // a user is being kicked. do we chop off the end of the army boot? case AC_KICK: + log(DEBUG,"OnAccessCheck AC_KICK"); if (dest->GetExt(founder,dummyptr)) { Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder"); |