Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / m_nick.c

diff --git a/ircd/m_nick.c b/ircd/m_nick.c
index 48e022c2cf0160e33f50d1c94629de90c8af9926..e986e2db34859fac978d3bcc386a112804b179e4 100644 (file)
--- a/ircd/m_nick.c
+++ b/ircd/m_nick.c
@@ -362,6 +362,17 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       return 0;
   }
   /* now we know we have a real collision. */
+  /*
+   * Note: From this point forward it can be assumed that
+   * acptr != sptr (point to different client structures).
+   */
+  assert(acptr != sptr);
+  /*
+   * If the older one is "non-person", the new entry is just
+   * allowed to overwrite it. Just silently drop non-person,
+   * and proceed with the nick. This should take care of the
+   * "dormant nick" way of generating collisions...
+   */
   if (IsUnknown(acptr) && MyConnect(acptr))
   {
     ServerStats->is_ref++;