Remove User::na, use User::nc everywhere. Will probably break everything, but opens the door to decoupling NC from NA, and means commands can now be run without bothering about changinc nick :)

More tweaking for na/nc usage.

It compiles, but it's still a work in progress.

Again, this compiles, but I *bet* there's no chance in hell it'll work. :)

Slightly better.

Set User::nc correctly.

Fix crash with unregistered nicks in core and ns_access.

Fix glist to work when you're not on that particular nick.

Fix ns_set to not crash and burn horribly.

Fix ns_set and ns_logout to not do bad things.

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

1 files changed, 2 insertions, 13 deletions

diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 70b89aa25..b376afa30 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -469,7 +469,6 @@ class InspIRCdProto : public IRCDProto
 					else --opcnt;
 					break;
 				case 'r':
-					user->svid = add ? user->timestamp : 0;
 					if (add && !nick_identified(user)) {
 						common_svsmode(user, "-r", NULL);
 						user->mode &= ~UMODE_r;
@@ -657,12 +656,6 @@ class InspIRCdProto : public IRCDProto
 		common_svsmode(u, "-r", NULL);
 	}
 
-	/* SVSMODE +r */
-	void SendSVID2(User *u, const char *ts)
-	{
-		common_svsmode(u, "+r", NULL);
-	}
-
 	void SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param)
 	{
 		User *u = finduser(nick);
@@ -1101,7 +1094,7 @@ int anope_event_sethost(const char *source, int ac, const char **av)
 
 int anope_event_nick(const char *source, int ac, const char **av)
 {
-	do_nick(source, av[0], NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL);
+	do_nick(source, av[0], NULL, NULL, NULL, NULL, 0, 0, NULL, NULL);
 	return MOD_CONT;
 }
 
@@ -1126,19 +1119,15 @@ int anope_event_uid(const char *source, int ac, const char **av)
 	struct in_addr addy;
 	Server *s = findserver_uid(servlist, source);
 	uint32 *ad = reinterpret_cast<uint32 *>(&addy);
-	int svid = 0;
 	int ts = strtoul(av[1], NULL, 10);
 
-	if (strchr(av[8], 'r') != NULL)
-		svid = ts;
-
 	inet_aton(av[6], &addy);
 	user = do_nick("", av[2],   /* nick */
 			av[5],   /* username */
 			av[3],   /* realhost */
 			s->name,  /* server */
 			av[ac - 1],   /* realname */
-			ts, svid, htonl(*ad), av[4], av[0]);
+			ts, htonl(*ad), av[4], av[0]);
 	if (user)
 	{
 		ircdproto->ProcessUsermodes(user, 1, &av[8]);