X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fopertype.cpp;h=32ffa4fc7706d44251b0ef60cf44854d7983f179;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=a1ad88007bcb845a302eaa3a485c12e8ba474fc7;hpb=e2af2347fc035d702e45f12e772223a8d578410d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index a1ad88007..32ffa4fc7 100644
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -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,17 +54,14 @@ 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;
 			}
 		}
 
 		if (dosend)
-			ServerInstance->SNO->WriteToSnoMask('O',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server, u->nick.c_str(),u->ident.c_str(), u->host.c_str(), irc::Spacify(opertype.c_str()));
+			ServerInstance->SNO->WriteToSnoMask('O',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server.c_str(), u->nick.c_str(),u->ident.c_str(), u->host.c_str(), irc::Spacify(opertype.c_str()));
 	}
 	return true;
 }