Remove CanSVSLogout and implement logout support on Plexus.

anope · May 9, 2024 · c36030c · c36030c
1 parent 33a02b1
commit c36030c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/include/protocol.h b/include/protocol.h
@@ -101,9 +101,6 @@ class CoreExport IRCDProto
 	/* See ns_cert */
 	bool CanCertFP = false;
 
-	/* Can users log out before being fully connected? */
-	bool CanSVSLogout = false;
-
 	/* Whether this IRCd requires unique IDs for each user or server. See TS6/P10. */
 	bool RequiresID = false;
 

diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp
@@ -145,7 +145,6 @@ class InspIRCdProto final
 		CanSetVIdent = true;
 		CanSQLine = true;
 		CanSZLine = true;
-		CanSVSLogout = true;
 		CanCertFP = true;
 		RequiresID = true;
 		MaxModes = 0;

diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
@@ -187,7 +187,15 @@ class PlexusProto final
 	void SendSVSLogin(const Anope::string &uid, NickAlias *na) override
 	{
 		Server *s = Server::Find(uid.substr(0, 3));
-		Uplink::Send("ENCAP", s ? s->GetName() : uid.substr(0, 3), "SVSLOGIN", uid, '*', '*', na->GetVHostHost().empty() ? "*" : na->GetVHostHost(), na->nc->display);
+		Anope::string target = s ? s->GetName() : uid.substr(0, 3);
+		if (na)
+		{
+			Uplink::Send("ENCAP", target, "SVSLOGIN", uid, '*', '*', na->GetVHostHost().empty() ? "*" : na->GetVHostHost(), na->nc->display);
+		}
+		else
+		{
+			Uplink::Send("ENCAP", target, "SU", uid, "");
+		}
 	}
 
 	void SendSVSNOOP(const Server *server, bool set) override

diff --git a/modules/protocol/solanum.cpp b/modules/protocol/solanum.cpp
@@ -45,7 +45,6 @@ class SolanumProto final
 		CanSZLine = true;
 		CanSVSNick = true;
 		CanSVSHold = true;
-		CanSVSLogout = true;
 		CanSetVHost = true;
 		RequiresID = true;
 		MaxModes = 4;

diff --git a/modules/protocol/unrealircd.cpp b/modules/protocol/unrealircd.cpp
@@ -37,7 +37,6 @@ class UnrealIRCdProto final
 		CanSZLine = true;
 		CanSVSHold = true;
 		CanClearBans = true;
-		CanSVSLogout = true;
 		CanCertFP = true;
 		RequiresID = true;
 		MaxModes = 12;

diff --git a/modules/sasl.cpp b/modules/sasl.cpp
@@ -145,14 +145,6 @@ class Anonymous final
 
 	void ProcessMessage(Session *sess, const SASL::Message &m) override
 	{
-		if (!IRCD->CanSVSLogout && !User::Find(sess->uid))
-		{
-			// This IRCd can't log users out yet.
-			sasl->Fail(sess);
-			delete sess;
-			return;
-		}
-
 		if (m.type == "S")
 		{
 			sasl->SendMessage(sess, "C", "+");