Put back use_forward.

[solanum.git] / src / supported.c

diff --git a/src/supported.c b/src/supported.c
index 6c6b33c05ff8aae531fd6205cd76a14a6e1ce491..ff59396d2739b1b209bf0cfb9a8345b9c961dcf3 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -71,14 +71,6 @@
  *
  *  All unknown/unlisted modes are treated as type D.
  */
-/* ELIST=[tokens]:
- *
- * M = mask search
- * N = !mask search
- * U = user count search (< >)
- * C = creation time search (C> C<)
- * T = topic search (T> T<)
- */
 
 #include "stdinc.h"
 #include "client.h"
@@ -116,7 +108,7 @@ change_isupport(const char *name, const char *(*func)(const void *), const void
 {
        rb_dlink_node *ptr;
        struct isupportitem *item;
-       void *oldvalue;
+       const void *oldvalue = NULL;
 
        RB_DLINK_FOREACH(ptr, isupportlist.head)
        {
@@ -126,7 +118,7 @@ change_isupport(const char *name, const char *(*func)(const void *), const void
                {
                        oldvalue = item->param;
 
-                       item->name = name;
+                       // item->name = name;
                        item->func = func;
                        item->param = param;
 
@@ -244,12 +236,19 @@ isupport_chanmodes(const void *ptr)
        return result;
 }
 
+static const char *
+isupport_chantypes(const void *ptr)
+{
+       return ConfigChannel.disable_local_channels ? "#" : "&#";
+}
+
 static const char *
 isupport_chanlimit(const void *ptr)
 {
        static char result[30];
 
-       rb_snprintf(result, sizeof result, "&#:%i", ConfigChannel.max_chans_per_user);
+       rb_snprintf(result, sizeof result, "%s:%i",
+               ConfigChannel.disable_local_channels ? "#" : "&#", ConfigChannel.max_chans_per_user);
        return result;
 }
 
@@ -297,7 +296,7 @@ init_isupport(void)
        static int channellen = LOC_CHANNELLEN;
        static int topiclen = TOPICLEN;
 
-       add_isupport("CHANTYPES", isupport_string, "&#");
+       add_isupport("CHANTYPES", isupport_chantypes, NULL);
        add_isupport("EXCEPTS", isupport_boolean, &ConfigChannel.use_except);
        add_isupport("INVEX", isupport_boolean, &ConfigChannel.use_invex);
        add_isupport("CHANMODES", isupport_chanmodes, NULL);
@@ -309,8 +308,6 @@ init_isupport(void)
        add_isupport("KNOCK", isupport_boolean, &ConfigChannel.use_knock);
        add_isupport("STATUSMSG", isupport_string, "@+");
        add_isupport("CALLERID", isupport_string, "g");
-       add_isupport("SAFELIST", isupport_string, "");
-       add_isupport("ELIST", isupport_string, "U");
        add_isupport("CASEMAPPING", isupport_string, "rfc1459");
        add_isupport("CHARSET", isupport_string, "ascii");
        add_isupport("NICKLEN", isupport_intptr, &nicklen);
@@ -324,4 +321,6 @@ init_isupport(void)
        add_isupport("FNC", isupport_string, "");
        add_isupport("TARGMAX", isupport_targmax, NULL);
        add_isupport("EXTBAN", isupport_extban, NULL);
+       add_isupport("WHOX", isupport_string, "");
+       add_isupport("CLIENTVER", isupport_string, "3.0");
 }