1
0
mirror of https://github.com/anope/anope.git synced 2026-06-28 04:16:37 +02:00

Merge the SASL data and ext parameters.

There might be more than this so its better to just store it in a
1+ parameter vector.
This commit is contained in:
Sadie Powell
2025-02-05 13:23:50 +00:00
parent ee18083bb7
commit 115c9eb5a0
6 changed files with 29 additions and 36 deletions
+5 -7
View File
@@ -178,10 +178,10 @@ public:
{
Server *s = Server::Find(message.target.substr(0, 3));
auto target = s ? s->GetName() : message.target.substr(0, 3);
if (message.ext.empty())
Uplink::Send("ENCAP", target, "SASL", message.source, message.target, message.type, message.data);
else
Uplink::Send("ENCAP", target, "SASL", message.source, message.target, message.type, message.data, message.ext);
auto newparams = message.data;
newparams.insert(newparams.begin(), { target, "SASL", message.source, message.target, message.type });
Uplink::SendInternal({}, Me, "ENCAP", newparams);
}
void SendSVSLogin(const Anope::string &uid, NickAlias *na) override
@@ -251,9 +251,7 @@ struct IRCDMessageEncap final
m.source = params[2];
m.target = params[3];
m.type = params[4];
m.data = params[5];
m.ext = params.size() > 6 ? params[6] : "";
m.data.assign(params.begin() + 5, params.end());
SASL::sasl->ProcessMessage(m);
}