Do not allow a topic change if a user may not send to the channel

[irc/rqf/shadowircd.git] / src / supported.c

diff --git a/src/supported.c b/src/supported.c
index d0d51f15011f3c503fa22c7cabe367714c0b836b..4ed2616f2f9a4680ef0f940ae9148d7643012fde 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -244,12 +244,20 @@ isupport_chanmodes(const void *ptr)
        return result;
 }
 
+static const char *
+isupport_chantypes(const void *ptr)
+{
+       return ConfigChannel.use_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.use_local_channels ? "&#" : "#", 
+                       ConfigChannel.max_chans_per_user);
        return result;
 }
 
@@ -259,9 +267,9 @@ isupport_prefix(const void *ptr)
        static char result[11];
 
        rb_snprintf(result, sizeof result, "(%so%sv)%s@%s+",
-                       ConfigChannel.use_owner ? "a" : "",
+                       ConfigChannel.use_admin ? "a" : "",
                        ConfigChannel.use_halfop ? "h" : "",
-                       ConfigChannel.use_owner ? "!" : "",
+                       ConfigChannel.use_admin ? "!" : "",
                        ConfigChannel.use_halfop ? "%" : "");
        return result;
 }
@@ -310,7 +318,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);