summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDukePyrolator <DukePyrolator@5417fbe8-f217-4b02-8779-1006273d7864>2009-10-12 05:19:03 +0000
committerDukePyrolator <DukePyrolator@5417fbe8-f217-4b02-8779-1006273d7864>2009-10-12 05:19:03 +0000
commitc79d189e89884d983c374704eadf822620095deb (patch)
tree65322710d9a29382635a02b4b195e7bf717e2b12
parent777c6cf07347fe96aee065046cbcbe4ac50fe1fb (diff)
fixed some bugs in ns_register.c
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2553 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--src/core/ns_register.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index ff16e5b33..ddaa2516e 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -52,13 +52,11 @@ class CommandNSConfirm : public Command
na->last_usermask = new char[u->GetIdent().length() + u->GetDisplayedHost().length() + 2];
sprintf(na->last_usermask, "%s@%s", u->GetIdent().c_str(), u->GetDisplayedHost().c_str());
na->last_realname = sstrdup(u->realname);
+ if (NSAddAccessOnReg)
+ na->nc->AddAccess(create_mask(u));
}
na->time_registered = na->last_seen = time(NULL);
-
- if (NSAddAccessOnReg)
- na->nc->AddAccess(create_mask(u));
-
na->nc->language = NSDefLanguage;
if (nr->email)
na->nc->email = sstrdup(nr->email);
@@ -119,14 +117,15 @@ class CommandNSConfirm : public Command
User *utmp = finduser(passcode);
if (utmp)
{
- ActuallyConfirmNick(u, nr, false);
- notice_lang(s_NickServ, u, NICK_FORCE_REG, nr->nick);
+ ActuallyConfirmNick(utmp, nr, false);
+ notice_lang(s_NickServ, u, NICK_FORCE_REG, utmp->nick);
return MOD_CONT;
}
else
{
passcode = nr->passcode;
ActuallyConfirmNick(u, nr, true);
+ return MOD_CONT;
}
}
else