Merge branch 'bug152-AllowedChannelTypes'

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 5e20deed423feef61343bf4524e09de2054d7219..07a6e5a530b677684b9f713db5bc31d4cce28f5c 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -344,7 +344,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                }
 
                chan = Channel_Search(channame);
-               if (!chan && Conf_PredefChannelsOnly) {
+               if (!chan && !strchr(Conf_AllowedChannelTypes, channame[0])) {
                         /* channel must be created, but forbidden by config */
                        IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
                                           Client_ID(Client), channame);