Add user/channel mode synchronisation detection to CAPAB - link will now drop if...

[user/henk/code/inspircd.git] / src / modes / umode_o.cpp

diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp
index 5d8b68ae22296b94feed12a3afdebfec0c8491c0..1eaa30c90a603381dfb8aa8bb99fdbfa59ca45a5 100644 (file)
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -21,10 +21,12 @@ ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, '
 {
 }
 
-ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding)
+ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding, bool servermode)
 {
        /* Only opers can execute this class at all */
-       if (!*source->oper)
+       if (!ServerInstance->ULine(source->nick.c_str()) &&
+               !ServerInstance->ULine(source->server) &&
+               source->oper.empty())
                return MODEACTION_DENY;
 
        /* Not even opers can GIVE the +o mode, only take it away */
@@ -37,7 +39,7 @@ ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, st
         * verifying as an oper and getting an opertype assigned
         * to your User!
         */
-       ServerInstance->SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick, source->nick);
+       ServerInstance->SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick.c_str(), source->nick.c_str());
        dest->UnOper();
 
        return MODEACTION_ALLOW;