From 92cc388aebd55245b24aef5950afe845feffe9e2 Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Sun, 26 Jan 2014 13:05:09 +0100
Subject: ProtocolInterface::SendEncapsulatedData() changes

- Pass command name and destination as real parameters
- Allow callers to specify the command source
- Send a SID instead of a server name if the target is a single server
---
 src/modules/m_sasl.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/modules/m_sasl.cpp')

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 796d343ea..074362651 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -31,7 +31,7 @@ static std::string sasl_target = "*";
 
 static void SendSASL(const parameterlist& params)
 {
-	if (!ServerInstance->PI->SendEncapsulatedData(params))
+	if (!ServerInstance->PI->SendEncapsulatedData(sasl_target, "SASL", params))
 	{
 		SASLFallback(NULL, params);
 	}
@@ -54,8 +54,6 @@ class SaslAuthenticator
 		: user(user_), state(SASL_INIT), state_announced(false)
 	{
 		parameterlist params;
-		params.push_back(sasl_target);
-		params.push_back("SASL");
 		params.push_back(user->uuid);
 		params.push_back("*");
 		params.push_back("S");
@@ -132,8 +130,6 @@ class SaslAuthenticator
 			return true;
 
 		parameterlist params;
-		params.push_back(sasl_target);
-		params.push_back("SASL");
 		params.push_back(this->user->uuid);
 		params.push_back(this->agent);
 		params.push_back("C");
-- 
cgit v1.3.1-10-gc9f91