Reset +r on change to grouped nick

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2409 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 4 insertions, 3 deletions

diff --git a/TODO b/TODO
index 3c3c1bd9d..17d245f09 100644
--- a/TODO
+++ b/TODO
@@ -18,7 +18,6 @@ Legend:
 [x] Settable oper flags (split into types containing privs+commands, allow each oper to be set to a type, like we do with insp?)
 
 Outstanding issues:
-- reset +r on change to grouped nick
 
 1.9.2
 -----
diff --git a/src/users.c b/src/users.c
index 8f51da449..a1a932e41 100644
--- a/src/users.c
+++ b/src/users.c
@@ -771,7 +771,8 @@ User *do_nick(const char *source, const char *nick, const char *username, const
 		ntmp->last_usermask = new char[user->GetIdent().length() + user->GetDisplayedHost().length() + 2];
 		sprintf(ntmp->last_usermask, "%s@%s",
 				user->GetIdent().c_str(), user->GetDisplayedHost().c_str());
-
+		ircdproto->SendAccountLogin(user, user->nc);
+		ircdproto->SetAutoIdentificationToken(user);
 		alog("%s: %s!%s@%s automatically identified for nick %s", s_NickServ, user->nick, user->GetIdent().c_str(), user->host, user->nick);
 	}
 
@@ -780,7 +781,8 @@ User *do_nick(const char *source, const char *nick, const char *username, const
 	{
 		if (nick_identified(user))
 		{
-			// XXX: I assume we need to reset +r on here.
+			ircdproto->SendAccountLogin(user, user->nc);
+			ircdproto->SetAutoIdentificationToken(user);
 		}
 	}