From: Ian Chard <ian@chard.org>
Date: Wed, 24 Jun 2015 14:51:37 +0000 (+0100)
Subject: Don't use a standard message number
X-Git-Tag: rel-23-rc1~18^2~2
X-Git-Url: https://arthur.barton.de/gitweb/?p=ngircd.git;a=commitdiff_plain;h=adfe5affedac5dcf3f66a1a8363429ba1a13ebeb

Don't use a standard message number
---

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index f3226011..79c0dcd4 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -268,7 +268,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 				   Channel_HasMode(chan, 'N') &&
 				   !Client_HasMode(Client, 'o'))
 					return IRC_WriteErrClient(Client,
-								  ERR_UNAVAILRESOURCE_MSG,
+								  ERR_NONICKCHANGE_MSG,
 								  Client_ID(Client),
 								  Channel_Name(chan));
 				chan = Channel_Next(chan);
diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h
index 15dbe8cf..4f1632b0 100644
--- a/src/ngircd/messages.h
+++ b/src/ngircd/messages.h
@@ -122,12 +122,12 @@
 #define ERR_NICKNAMETOOLONG_MSG		"432 %s %s :Nickname too long, max. %u characters"
 #define ERR_FORBIDDENNICKNAME_MSG	"432 %s %s :Nickname is forbidden/blocked"
 #define ERR_NICKNAMEINUSE_MSG		"433 %s %s :Nickname already in use"
-#define ERR_UNAVAILRESOURCE_MSG		"437 %s :Cannot change nickname while on %s(+N)"
 #define ERR_USERNOTINCHANNEL_MSG	"441 %s %s %s :They aren't on that channel"
 #define ERR_NOTONCHANNEL_MSG		"442 %s %s :You are not on that channel"
 #define ERR_USERONCHANNEL_MSG		"443 %s %s %s :is already on channel"
 #define ERR_SUMMONDISABLED_MSG		"445 %s :SUMMON has been disabled"
 #define ERR_USERSDISABLED_MSG		"446 %s :USERS has been disabled"
+#define ERR_NONICKCHANGE_MSG		"447 %s :Cannot change nickname while on %s(+N)"
 #define ERR_NOTREGISTERED_MSG		"451 %s :Connection not registered"
 #define ERR_NOTREGISTEREDSERVER_MSG	"451 %s :Connection not registered as server link"
 #define ERR_NEEDMOREPARAMS_MSG		"461 %s %s :Syntax error"