X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=4204737cac5d187d3134b945a64b86d82313638b;hb=36f93c0e7f8a980943237b0b28138ade86f5e573;hp=f2e394c37ca0dbdde9538610739026143609de03;hpb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index f2e394c37..4204737ca 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -62,7 +62,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 		 * Nick collision.
 		 */
 		int collide = sock->DoCollision(iter->second, age_t, params[5], params[6], params[0]);
-		ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
 		if (collide != 1)
 		{
@@ -85,7 +85,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	}
 	catch (...)
 	{
-		ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
 		return CMD_INVALID;
 	}
 	(*(ServerInstance->Users->clientlist))[params[2]] = _new;
@@ -100,15 +100,17 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
 	unsigned int paramptr = 9;
 
-	// Accept more '+' chars, for now
-	std::string::size_type pos = modestr.find_first_not_of('+');
-	for (std::string::const_iterator v = modestr.begin()+pos; v != modestr.end(); ++v)
+	for (std::string::const_iterator v = modestr.begin(); v != modestr.end(); ++v)
 	{
+		// Accept more '+' chars, for now
+		if (*v == '+')
+			continue;
+
 		/* For each mode thats set, find the mode handler and set it on the new user */
 		ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
 		if (!mh)
 		{
-			ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v);
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unrecognised mode '%c' for a user in UID, dropping link", *v);
 			return CMD_INVALID;
 		}
 
@@ -130,7 +132,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 		}
 		else
 			mh->OnModeChange(_new, _new, NULL, empty, true);
-		_new->SetMode(*v, true);
+		_new->SetMode(mh, true);
 	}
 
 	_new->SetClientIP(params[6].c_str());