switch sasl_usercloak.c to use SNO_BANNED

[solanum.git] / include / s_serv.h

diff --git a/include/s_serv.h b/include/s_serv.h
index 169007538ba84ee12207a701fc7d6e30eaa6ef3c..b917aa6f44a6de243fd1a356462f30189c71be5d 100644 (file)
--- a/include/s_serv.h
+++ b/include/s_serv.h
@@ -20,14 +20,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: s_serv.h 1863 2006-08-27 13:40:37Z jilles $
  */
 
 #ifndef INCLUDED_serv_h
 #define INCLUDED_serv_h
 
-#include "config.h"
+#include "defaults.h"
 #include "capability.h"
 
 /*
@@ -49,6 +47,27 @@ struct Channel;
 
 /* Capabilities */
 extern struct CapabilityIndex *serv_capindex;
+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_PRIORITY  0x002
+
+struct ClientCapability {
+       bool (*visible)(struct Client *);               /* whether or not to display the capability.  set to NULL or true return value = displayed */
+       const char *(*data)(struct Client *);           /* any custom data for the capability.  set to NULL or return NULL = no data */
+       unsigned int flags;
+};
+
+/* 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
@@ -60,7 +79,6 @@ 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 */
@@ -78,12 +96,6 @@ 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))
 
-#ifdef HAVE_LIBZ
-#define CAP_ZIP_SUPPORTED       CAP_ZIP
-#else
-#define CAP_ZIP_SUPPORTED       0
-#endif
-
 /*
  * Capability macros.
  */