X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/cc32202d96d87241698b7897178494ab1fa76e5a..c98390004f4f14cd8215302d77313f81e2546e22:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index ce4e3ec..ef413d5 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_user.c 3584 2007-11-20 11:08:23Z nenolod $
+ *  $Id: s_user.c 3586 2007-11-20 11:16:43Z nenolod $
  */
 
 #include "stdinc.h"
@@ -534,12 +534,13 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	dlinkMoveNode(&source_p->localClient->tnode, &unknown_list, &lclient_list);
 	SetClient(source_p);
 
-	/* XXX source_p->servptr is &me, since local client */
-	source_p->servptr = find_server(NULL, user->server);
+	source_p->servptr = &me;
 	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
+
 	/* Increment our total user count here */
 	if(++Count.total > Count.max_tot)
 		Count.max_tot = Count.total;
+
 	source_p->localClient->allow_read = MAX_FLOOD_BURST;
 
 	Count.totalrestartcount++;
@@ -636,7 +637,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 			      nick, source_p->hopcount + 1,
 			      (long) source_p->tsinfo,
 			      ubuf, source_p->username, source_p->host,
-			      user->server, source_p->info);
+			      source_p->servptr->name, source_p->info);
 	}
 	else
 		sendto_server(client_p, NULL, NOCAPS, NOCAPS,
@@ -644,7 +645,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 			      nick, source_p->hopcount + 1,
 			      (long) source_p->tsinfo,
 			      ubuf, source_p->username, source_p->host,
-			      user->server, source_p->info);
+			      source_p->servptr->name, source_p->info);
 
 	if (IsDynSpoof(source_p))
 	{