From 0f1ab797e4034c4d32a40ab1d31d92f3d002cdd6 Mon Sep 17 00:00:00 2001 From: Stephen Bennett Date: Tue, 24 Aug 2010 21:30:56 +0100 Subject: [PATCH] Backed out changeset 8939a7e03d15 The code behind this capability was never implemented, and subsequent discussions have agreed to approach the problem differently. There seems no reason to continue advertising a capability that does nothing. --- include/client.h | 1 - modules/m_cap.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/client.h b/include/client.h index e145aa54..4a28a307 100644 --- a/include/client.h +++ b/include/client.h @@ -443,7 +443,6 @@ struct ListClient #define CLICAP_MULTI_PREFIX 0x0001 #define CLICAP_SASL 0x0002 -#define CLICAP_ACCOUNT_HOSTMASK 0x0004 /* * flags macros. diff --git a/modules/m_cap.c b/modules/m_cap.c index bf929953..94aebaca 100644 --- a/modules/m_cap.c +++ b/modules/m_cap.c @@ -69,8 +69,7 @@ static struct clicap int namelen; } clicap_list[] = { _CLICAP("multi-prefix", CLICAP_MULTI_PREFIX, 0, 0), - _CLICAP("sasl", CLICAP_SASL, 0, 0), - _CLICAP("source-account-hostmask", CLICAP_ACCOUNT_HOSTMASK, 0, 0), + _CLICAP("sasl", CLICAP_SASL, 0, 0) }; #define CLICAP_LIST_LEN (sizeof(clicap_list) / sizeof(struct clicap)) @@ -175,7 +174,7 @@ clicap_generate(struct Client *source_p, const char *subcmd, int flags, int clea char *p; int buflen = 0; int curlen, mlen; - size_t i; + int i; mlen = rb_sprintf(buf, ":%s CAP %s %s", me.name,