-#define CAP_CAP 0x00001 /* received a CAP to begin with */
-#define CAP_QS 0x00002 /* Can handle quit storm removal */
-#define CAP_EX 0x00004 /* Can do channel +e exemptions */
-#define CAP_CHW 0x00008 /* Can do channel wall @# */
-#define CAP_IE 0x00010 /* Can do invite exceptions */
-#define CAP_KLN 0x00040 /* Can do KLINE message */
-#define CAP_GLN 0x00080 /* Can do GLINE message */
-#define CAP_ZIP 0x00100 /* Can do ZIPlinks */
-#define CAP_KNOCK 0x00400 /* supports KNOCK */
-#define CAP_TB 0x00800 /* supports TBURST */
-#define CAP_UNKLN 0x01000 /* supports remote unkline */
-#define CAP_CLUSTER 0x02000 /* supports cluster stuff */
-#define CAP_ENCAP 0x04000 /* supports ENCAP */
-#define CAP_TS6 0x08000 /* supports TS6 or above */
-#define CAP_SERVICE 0x10000
-#define CAP_RSFNC 0x20000 /* rserv FNC */
-#define CAP_SAVE 0x40000 /* supports SAVE (nick collision FNC) */
-#define CAP_EUID 0x80000 /* supports EUID (ext UID + nonencap CHGHOST) */
-
-#define CAP_MASK (CAP_QS | CAP_EX | CAP_CHW | \
- CAP_IE | CAP_KLN | CAP_SERVICE |\
- CAP_GLN | CAP_CLUSTER | CAP_ENCAP | \
- CAP_ZIP | CAP_KNOCK | CAP_UNKLN | \
- CAP_RSFNC | CAP_SAVE | CAP_EUID)
+/* builtin client capabilities */
+extern unsigned int CLICAP_MULTI_PREFIX;
+extern unsigned int CLICAP_ACCOUNT_NOTIFY;
+extern unsigned int CLICAP_EXTENDED_JOIN;
+extern unsigned int CLICAP_AWAY_NOTIFY;
+extern unsigned int CLICAP_USERHOST_IN_NAMES;
+extern unsigned int CLICAP_CAP_NOTIFY;
+extern unsigned int CLICAP_CHGHOST;
+extern unsigned int CLICAP_ECHO_MESSAGE;
+
+/*
+ * XXX: this is kind of ugly, but this allows us to have backwards
+ * API-compatibility.
+ */
+extern unsigned int CAP_CAP; /* received a CAP to begin with */
+extern unsigned int CAP_QS; /* Can handle quit storm removal */
+extern unsigned int CAP_EX; /* Can do channel +e exemptions */
+extern unsigned int CAP_CHW; /* Can do channel wall @# */
+extern unsigned int CAP_IE; /* Can do invite exceptions */
+extern unsigned int CAP_KLN; /* Can do KLINE message */
+extern unsigned int CAP_ZIP; /* Can do ZIPlinks */
+extern unsigned int CAP_KNOCK; /* supports KNOCK */
+extern unsigned int CAP_TB; /* supports TBURST */
+extern unsigned int CAP_UNKLN; /* supports remote unkline */
+extern unsigned int CAP_CLUSTER; /* supports cluster stuff */
+extern unsigned int CAP_ENCAP; /* supports ENCAP */
+extern unsigned int CAP_TS6; /* supports TS6 or above */
+extern unsigned int CAP_SERVICE; /* supports services */
+extern unsigned int CAP_RSFNC; /* rserv FNC */
+extern unsigned int CAP_SAVE; /* supports SAVE (nick collision FNC) */
+extern unsigned int CAP_EUID; /* supports EUID (ext UID + nonencap CHGHOST) */
+extern unsigned int CAP_EOPMOD; /* supports EOPMOD (ext +z + ext topic) */
+extern unsigned int CAP_BAN; /* supports propagated bans */
+extern unsigned int CAP_MLOCK; /* supports MLOCK messages */
+
+/* XXX: added for backwards compatibility. --nenolod */
+#define CAP_MASK (capability_index_mask(serv_capindex) & ~(CAP_TS6 | CAP_CAP))