X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fnumeric.c;h=c3d94c3db7b53c5614fbfaf6cd6ddf1ebb60be65;hb=8605e9c0fe7ffa42149271c9af31288bd4a0dfac;hp=fa32097d027ef66e42f1667f3ca23f9d06e907a1;hpb=ec0b405d9d75045e521136ff28e42d7212f14834;p=ngircd-alex.git

diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c
index fa32097d..c3d94c3d 100644
--- a/src/ngircd/numeric.c
+++ b/src/ngircd/numeric.c
@@ -131,7 +131,7 @@ Announce_Server(CLIENT * Client, CLIENT * Server)
 	if (Client_Hops(Server) == 1)
 		c = Client_ThisServer();
 	else
-		c = Client_Introducer(Server);
+		c = Client_TopServer(Server);
 
 	/* Inform new server about the one already registered in the network */
 	return IRC_WriteStrClientPrefix(Client, c, "SERVER %s %d %d :%s",
@@ -341,6 +341,10 @@ IRC_Num_ENDOFMOTD(CLIENT * Client, UNUSED REQUEST * Req)
 	/* Announce all channels to the new server */
 	chan = Channel_First();
 	while (chan) {
+		if (Channel_IsLocal(chan)) {
+			chan = Channel_Next(chan);
+			continue;
+		}
 #ifdef IRCPLUS
 		/* Send CHANINFO if the peer supports it */
 		if (strchr(Client_Flags(Client), 'C')) {