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.

diff --git a/include/client.h b/include/client.h
index e145aa5476e7f6bb0d7b1f1c624e4223afe94fad..4a28a3079c959fc21372b623d3f95e3a99daab40 100644 (file)
--- 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 bf9299533f398990ca47970ddb05735e04522980..94aebaca8eee25f3cf679088d28a127714b8de64 100644 (file)
--- 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,