From fb4d994f404405d25924f6830dedb6f06c4aab4b Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Sun, 13 Oct 2019 08:56:05 +0200
Subject: [PATCH] Rip out support for servers lacking NOQUIT.

---
 include/struct.h       |  4 ----
 src/misc.c             | 13 +------------
 src/modules/protoctl.c |  4 ----
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/include/struct.h b/include/struct.h
index 1baa7b1e3..37855e21e 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -331,7 +331,6 @@ typedef enum ClientStatus {
  * Note that client protocol extensions have been moved
  * to the ClientCapability API which uses acptr->local->caps.
  */
-#define PROTO_NOQUIT	0x000001	/* Negotiated NOQUIT protocol */
 #define PROTO_SJOIN	0x000002	/* Negotiated SJOIN protocol */
 #define PROTO_SJOIN2	0x000008	/* Negotiated SJOIN2 protocol */
 #define PROTO_UMODE2	0x000010	/* Negotiated UMODE2 protocol */
@@ -508,7 +507,6 @@ typedef enum ClientStatus {
 #define CHECKPROTO(x,y) (checkprotoflags(x, y, __FILE__, __LINE__))
 #endif
 
-#define DontSendQuit(x)		(CHECKPROTO(x, PROTO_NOQUIT))
 #define SupportSJOIN(x)		(CHECKPROTO(x, PROTO_SJOIN))
 #define SupportNICKIP(x)	(CHECKPROTO(x, PROTO_NICKIP))
 #define SupportSJOIN2(x)	(CHECKPROTO(x, PROTO_SJOIN2))
@@ -524,7 +522,6 @@ typedef enum ClientStatus {
 #define SupportMTAGS(x)		(CHECKPROTO(x, PROTO_MTAGS))
 
 #define SetSJOIN(x)		((x)->local->proto |= PROTO_SJOIN)
-#define SetNoQuit(x)		((x)->local->proto |= PROTO_NOQUIT)
 #define SetSJOIN2(x)		((x)->local->proto |= PROTO_SJOIN2)
 #define SetUMODE2(x)		((x)->local->proto |= PROTO_UMODE2)
 #define SetVL(x)		((x)->local->proto |= PROTO_VL)
@@ -537,7 +534,6 @@ typedef enum ClientStatus {
 #define SetMTAGS(x)		((x)->local->proto |= PROTO_MTAGS)
 
 #define ClearSJOIN(x)		((x)->local->proto &= ~PROTO_SJOIN)
-#define ClearNoQuit(x)		((x)->local->proto &= ~PROTO_NOQUIT)
 #define ClearSJOIN2(x)		((x)->local->proto &= ~PROTO_SJOIN2)
 #define ClearUMODE2(x)		((x)->local->proto &= ~PROTO_UMODE2)
 #define ClearVL(x)		((x)->local->proto &= ~PROTO_VL)
diff --git a/src/misc.c b/src/misc.c
index f518f4296..1a3e8294e 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -382,17 +382,6 @@ static void recurse_send_quits(Client *cptr, Client *client, Client *from, Clien
 	if (!MyConnect(to))
 		return; /* We shouldn't even be called for non-remotes */
 
-	if (!CHECKPROTO(to, PROTO_NOQUIT))
-	{
-		list_for_each_entry_safe(acptr, next, &client_list, client_node)
-		{
-			if (acptr->srvptr != client)
-				continue;
-
-			sendto_one(to, NULL, ":%s QUIT :%s", acptr->name, splitstr);
-		}
-	}
-
 	list_for_each_entry_safe(acptr, next, &global_server_list, client_node)
 	{
 		if (acptr->srvptr != client)
@@ -401,7 +390,7 @@ static void recurse_send_quits(Client *cptr, Client *client, Client *from, Clien
 		recurse_send_quits(cptr, acptr, from, to, mtags, comment, splitstr);
 	}
 
-	if ((cptr == client && to != from) || !CHECKPROTO(to, PROTO_NOQUIT))
+	if (cptr == client && to != from)
 		sendto_one(to, mtags, "SQUIT %s :%s", client->name, comment);
 }
 
diff --git a/src/modules/protoctl.c b/src/modules/protoctl.c
index faed5910c..57b2fd936 100644
--- a/src/modules/protoctl.c
+++ b/src/modules/protoctl.c
@@ -94,10 +94,6 @@ CMD_FUNC(cmd_protoctl)
 		{
 			SetCapability(client, "userhost-in-names");
 		}
-		else if (!strcmp(name, "NOQUIT"))
-		{
-			SetNoQuit(client);
-		}
 		else if (!strcmp(name, "SJOIN"))
 		{
 			SetSJOIN(client);