X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8e425f4137f87d4b537d60df4206b221889d2121..afd4834b500ef6f53c3f70f44c73637e26dc94c1:/modules/core/m_nick.c

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 7335399..eec78fa 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -108,7 +108,6 @@ static int perform_nickchange_collides(struct Client *, struct Client *,
 				       struct Client *, int, const char **, time_t, const char *);
 
 /* mr_nick()
- *       parv[0] = sender prefix
  *       parv[1] = nickname
  */
 static int
@@ -175,7 +174,6 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 }
 
 /* m_nick()
- *     parv[0] = sender prefix
  *     parv[1] = nickname
  */
 static int
@@ -258,7 +256,6 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 /* mc_nick()
  *      
  * server -> server nick change
- *    parv[0] = sender prefix
  *    parv[1] = nickname
  *    parv[2] = TS when nick change
  */
@@ -694,6 +691,16 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
 					nick, chptr->chname);
 			return;
 		}
+
+		chptr = find_nonickchange_channel(source_p);
+		if (chptr != NULL)
+		{
+			sendto_one_numeric(source_p, ERR_NONICK,
+					form_str(ERR_NONICK),
+					chptr->chname);
+			return;
+		}
+
 		if((source_p->localClient->last_nick_change + ConfigFileEntry.max_nick_time) < rb_current_time())
 			source_p->localClient->number_of_nick_changes = 0;