Change more modules to VF_OPTCOMMON and assert identical charsets in m_nationalchars

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

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 38b621fb5e0b1ace982006208739b31a91c63917..cdc47861aaa0a3bd308ff749d4b01b61e565fccf 100644 (file)
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -35,7 +35,14 @@ bool TreeSocket::OperType(const std::string &prefix, parameterlist &params)
                if (!IS_OPER(u))
                        ServerInstance->Users->all_opers.push_back(u);
                u->modes[UM_OPERATOR] = 1;
-               u->oper.assign(opertype, 0, 512);
+               OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + opertype);
+               if (iter != ServerInstance->Config->oper_blocks.end())
+                       u->oper = iter->second;
+               else
+               {
+                       u->oper = new OperInfo;
+                       u->oper->name = opertype;
+               }
                Utils->DoOneToAllButSender(u->uuid, "OPERTYPE", params, u->server);
 
                TreeServer* remoteserver = Utils->FindServer(u->server);
@@ -47,10 +54,7 @@ bool TreeSocket::OperType(const std::string &prefix, parameterlist &params)
                         * If quiet bursts are enabled, and server is bursting or silent uline (i.e. services),
                         * then do nothing. -- w00t
                         */
-                       if (
-                               remoteserver->bursting ||
-                               ServerInstance->SilentULine(ServerInstance->FindServerNamePtr(u->server))
-                          )
+                       if (remoteserver->bursting || ServerInstance->SilentULine(u->server))
                        {
                                dosend = false;
                        }