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, 14 deletions

diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index fb498eb06..f27d3df0c 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -471,7 +471,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;
@@ -656,12 +655,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)
 	{
 		send_cmd(source, "SVSJOIN %s %s", nick, chan);
@@ -1075,27 +1068,22 @@ int anope_event_nick(const char *source, int ac, const char **av)
 
 	if (ac != 1) {
 		if (ac == 8) {
-			int svid = 0;
 			int ts = strtoul(av[0], NULL, 10);
 
-			if (strchr(av[5], 'r') != NULL)
-				svid = ts;
-
 			inet_aton(av[6], &addy);
 			user = do_nick("", av[1],   /* nick */
 						   av[4],   /* username */
 						   av[2],   /* realhost */
 						   source,  /* server */
 						   av[7],   /* realname */
-						   ts, svid, htonl(*ad), av[3], NULL);
+						   ts, htonl(*ad), av[3], NULL);
 			if (user) {
 				ircdproto->ProcessUsermodes(user, 1, &av[5]);
 				user->chost = av[3];
 			}
 		}
 	} else {
-		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;
 }