]> arthur.barton.de Git - ngircd-alex.git/commitdiff
Revert "Show allowed channel types in ISUPPORT(005) numeric only"
authorAlexander Barton <alex@barton.de>
Mon, 2 Nov 2020 10:45:41 +0000 (11:45 +0100)
committerAlexander Barton <alex@barton.de>
Mon, 2 Nov 2020 10:45:41 +0000 (11:45 +0100)
The ISUPPORT(005) numeric lists only channel prefixes which are listed
in the "AllowedChannelTypes" configuration option. And if this is the
empty string ("") for example, this now results in IRC clients assuming
"oh, no channel prefix characters at all, so no channels at all, so no
PRIVMSG can go to any channel" -- which is not the case when there are
pre-defined channel set up or other servers still having channels!

So "allowed channel types" != "supported channel types", and we always
have to list all supported ones in the ISUPPORT(005) numeric!

This reverts commit 4b7e8db418340576c95f1edad8470b66d6fe886d.

Closes #285.

src/ngircd/irc-info.c

index e38d5bb6f3338629f35cc2e22b7ef46bb08f6e15..82bd55182d774a54343c4634ae5271032a3aba8c 100644 (file)
@@ -1565,8 +1565,7 @@ IRC_Send_ISUPPORT(CLIENT * Client)
                                                   Conf_Network))
                return DISCONNECTED;
        if (!IRC_WriteStrClient(Client, RPL_ISUPPORT1_MSG, Client_ID(Client),
-                               Conf_AllowedChannelTypes, Conf_AllowedChannelTypes,
-                               Conf_MaxJoins))
+                               CHANTYPES, CHANTYPES, Conf_MaxJoins))
                return DISCONNECTED;
        return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client),
                                  CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1,