From 827469600e8cf98fea7aec09ceaa77a097300b72 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 2 Jan 2013 13:59:33 -0500 Subject: Move nickserv validate stuff to an event in nickserv.cpp --- modules/protocol/unreal.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'modules/protocol/unreal.cpp') diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp index 467724c49..bba15deec 100644 --- a/modules/protocol/unreal.cpp +++ b/modules/protocol/unreal.cpp @@ -803,7 +803,7 @@ struct IRCDMessageNick : IRCDMessage User *user = new User(params[0], params[3], params[4], vhost, ip, s, params[10], user_ts, params[7]); - const NickAlias *na = NULL; + NickAlias *na = NULL; if (params[6] == "0") ; @@ -817,14 +817,8 @@ struct IRCDMessageNick : IRCDMessage na = NickAlias::Find(params[6]); } - if (na) - { - user->Login(na->nc); - if (!Config->NoNicknameOwnership && na->nc->HasFlag(NI_UNCONFIRMED) == false) - user->SetMode(NickServ, UMODE_REGISTERED); - } - else if (NickServService) - NickServService->Validate(user); + if (na && NickServService) + NickServService->Login(user, na); } else source.GetUser()->ChangeNick(params[0]); -- cgit