1
0
mirror of https://github.com/anope/anope.git synced 2026-07-07 20:23:13 +02:00

Fixed +r not being removed on netmerge from previously ID'd users who now using an unregged nick.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2516 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
jantje_85
2009-09-26 14:39:16 +00:00
parent 43f85bf4f2
commit 39960787de
+4 -2
View File
@@ -1178,7 +1178,8 @@ int anope_event_uid(const char *source, int ac, const char **av)
* If not, validate the user. ~ Viper*/
user = prev_u_intro;
prev_u_intro = NULL;
if (user && user->server->sync == SSYNC_IN_PROGRESS && (na = findnick(user->nick)) && na->nc != user->nc)
if (user) na = findnick(user->nick);
if (user && user->server->sync == SSYNC_IN_PROGRESS && (!na || na->nc != user->nc))
{
validate_user(user);
common_svsmode(user, "-r", NULL);
@@ -1426,7 +1427,8 @@ int anope_event_endburst(const char *source, int ac, const char **av)
/* Check if the previously introduced user was Id'd for the nickgroup of the nick he s currently using.
* If not, validate the user. ~ Viper*/
prev_u_intro = NULL;
if (u && u->server->sync == SSYNC_IN_PROGRESS && (na = findnick(u->nick)) && na->nc != u->nc)
if (u) na = findnick(u->nick);
if (u && u->server->sync == SSYNC_IN_PROGRESS && (!na || na->nc != u->nc))
{
common_svsmode(u, "-r", NULL);
validate_user(u);