From: DNS777 <dns@rbose.org>
Date: Tue, 16 Oct 2012 05:28:44 +0000 (+0200)
Subject: PredefChannelsOnly: Fix message for non pre-defined channels
X-Git-Tag: rel-20-rc1~16
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=a7f37cebdc300b3b87bb8d6b558769cf11441f61;hp=47b99c69cc411ec35078917ab6d9d7278ed2a1da

PredefChannelsOnly: Fix message for non pre-defined channels

If PredefChannelsOnly is enabled, and if someone tries to create
a channel which does not exist, then the error message is a 474.
The 474 Error message changed recently and does not match anymore:
'Cannot join channel (+b) -- You are banned'.

Changed the error message to numeric 403 'No such channel'.

Bug introduced by commit 9a82304a.

(cherry picked from commit 2c2e08f34187a33c1da745995c5f213e33a91410)
---

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index ed4839af..41947a8a 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -365,7 +365,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 		chan = Channel_Search(channame);
 		if (!chan && Conf_PredefChannelsOnly) {
 			 /* channel must be created, but forbidden by config */
-			IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG,
+			IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
 					   Client_ID(Client), channame);
 			goto join_next;
 		}