From 9f9e21dfbe5053ebb5c62809aa0f92a4152e6759 Mon Sep 17 00:00:00 2001 From: Ed Kellett Date: Mon, 19 Oct 2020 12:27:55 +0100 Subject: [PATCH] Kill CLICAP_FLAGS_REQACK --- include/s_serv.h | 1 - modules/m_cap.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/include/s_serv.h b/include/s_serv.h index 6808c37e..e3893dcb 100644 --- a/include/s_serv.h +++ b/include/s_serv.h @@ -51,7 +51,6 @@ extern struct CapabilityIndex *cli_capindex; /* register client capabilities with this structure for 3.2 enhanced capability negotiation */ #define CLICAP_FLAGS_STICKY 0x001 -#define CLICAP_FLAGS_REQACK 0x002 struct ClientCapability { bool (*visible)(struct Client *); /* whether or not to display the capability. set to NULL or true return value = displayed */ diff --git a/modules/m_cap.c b/modules/m_cap.c index 6dc58cba..26215028 100644 --- a/modules/m_cap.c +++ b/modules/m_cap.c @@ -351,12 +351,6 @@ cap_req(struct Client *source_p, const char *arg) capadd |= (1 << cap->value); } - /* XXX this probably should exclude REQACK'd caps from capadd/capdel, but keep old behaviour for now */ - if(HasCapabilityFlag(cap, CLICAP_FLAGS_REQACK)) - { - type = "~"; - } - for (int attempts = 0; attempts < 2; attempts++) { if (rb_snprintf_try_append(buf_list[i], max_list, "%s%s%s", buf_list[i][0] == '\0' ? "" : " ", /* space between caps */