From: Alexander Barton <alex@barton.de>
Date: Thu, 24 Apr 2008 21:52:54 +0000 (+0200)
Subject: Report ERR_NOTONCHANNEL when trying to part a channel one is not member of.
X-Git-Tag: rel-0-12-0-pre2~3^2~2
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=523a6fad097cedd31a6931a29d91bab0d391df63

Report ERR_NOTONCHANNEL when trying to part a channel one is not member of.

When trying to part a channel ("PART #channel") the client is not member of
the daemon now correctly reports the numeric ERR_NOTONCHANNEL (442) insted
of ERR_NOSUCHCHANNEL (403).
---

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index a4eca1f1..32f911a2 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -218,11 +218,16 @@ Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Rea
 	assert(Reason != NULL);
 
 	chan = Channel_Search(Name);
-	if ((!chan) || (!Get_Cl2Chan(chan, Client))) {
+	if (!chan) {
 		IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
 				   Client_ID(Client), Name);
 		return false;
 	}
+	if (!Get_Cl2Chan(chan, Client)) {
+		IRC_WriteStrClient(Client, ERR_NOTONCHANNEL_MSG,
+				   Client_ID(Client), Name);
+		return false;
+	}
 
 	if (!Remove_Client(REMOVE_PART, chan, Client, Origin, Reason, true))
 		return false;