From 25e995b0f53db4f71ee4cf11faa215f380f0654a Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 10 Dec 2010 13:30:27 -0500 Subject: [PATCH] Fixed a few places in the plexus protocol module where we were sending nick not UID --- modules/protocol/plexus.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index da571840b..fc5e48e7b 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -152,12 +152,15 @@ class PlexusProto : public IRCDProto void SendServer(const Server *server) { - send_cmd("", "SERVER %s %d :%s", server->GetName().c_str(), server->GetHops(), server->GetDescription().c_str()); + if (server == Me) + send_cmd("", "SERVER %s %d :%s", server->GetName().c_str(), server->GetHops(), server->GetDescription().c_str()); + else + send_cmd(Config->Numeric, "SID %s %d %s :%s", server->GetName().c_str(), 2, server->GetSID().c_str(), server->GetDescription().c_str()); } void SendForceNickChange(const User *u, const Anope::string &newnick, time_t when) { - send_cmd(Config->Numeric, "ENCAP %s SVSNICK %s %ld %s %ld", u->server->GetName().c_str(), u->nick.c_str(), static_cast(u->timestamp), newnick.c_str(), static_cast(when)); + send_cmd(Config->Numeric, "ENCAP %s SVSNICK %s %ld %s %ld", u->server->GetName().c_str(), u->GetUID().c_str(), static_cast(u->timestamp), newnick.c_str(), static_cast(when)); } void SendConnect() @@ -199,7 +202,7 @@ class PlexusProto : public IRCDProto void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf) { - send_cmd(bi ? bi->GetUID() : Config->Numeric, "ENCAP * SVSMODE %s %ld %s", u->nick.c_str(), static_cast(u->timestamp), buf.c_str()); + send_cmd(bi ? bi->GetUID() : Config->Numeric, "ENCAP * SVSMODE %s %ld %s", u->GetUID().c_str(), static_cast(u->timestamp), buf.c_str()); } void SendKickInternal(const BotInfo *bi, const Channel *chan, const User *user, const Anope::string &buf)