- Moved sendto_connectnotice, and thus the call to HOOKTYPE_LOCAL_CONNECT,

  so it gets called after the broadcast of NICK to other servers.

2 files changed, 9 insertions, 5 deletions

diff --git a/Changes b/Changes
index 4acb95ece..6807544fa 100644
--- a/Changes
+++ b/Changes
@@ -2428,3 +2428,5 @@
   can be used to request passive notifications for accountname changes.
 - If set::options::dont-resolve is enabled, then use only the IP information
   from a WEBIRC message, reported by Ismat (#4103).
+- Moved sendto_connectnotice, and thus the call to HOOKTYPE_LOCAL_CONNECT,
+  so it gets called after the broadcast of NICK to other servers.
diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c
index 0ca9d0e9c..ed25e1abe 100644
--- a/src/modules/m_nick.c
+++ b/src/modules/m_nick.c
@@ -1101,7 +1101,6 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha
 			    sptr->name, olduser, userbad, stripuser);
 #endif
 		nextping = TStime();
-		sendto_connectnotice(nick, user, sptr, 0, NULL);
 		if (IsSecure(sptr))
 			sptr->umodes |= UMODE_SECURE;
 	}
@@ -1175,13 +1174,16 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha
 	    (!buf || *buf == '\0' ? "+" : buf),
 	    sptr->umodes & UMODE_SETHOST ? sptr->user->virthost : NULL);
 
-	/* Send password from sptr->passwd to NickServ for identification,
-	 * if passwd given and if NickServ is online.
-	 * - by taz, modified by Wizzu
-	 */
 	if (MyConnect(sptr))
 	{
 		char userhost[USERLEN + HOSTLEN + 6];
+
+		sendto_connectnotice(nick, user, sptr, 0, NULL); /* moved down, for modules. */
+
+		/* Send password from sptr->passwd to NickServ for identification,
+		 * if passwd given and if NickServ is online.
+		 * - by taz, modified by Wizzu
+		 */
 		if (sptr->passwd && (nsptr = find_person(NickServ, NULL)))
 		{
 			int do_identify = 1;