X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-server.c;h=9de2de2b7290dab5e8792beb8b448ebef066b712;hb=7bbdfb3d847034d7ee1881027164a087b9480300;hp=aafafe688c8c54275703ba15aed92b943bc957e7;hpb=7d30c8cebccf1b0e391333858a9d011d1f0d864e;p=ngircd-alex.git

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index aafafe68..9de2de2b 100644
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-server.c,v 1.14 2002/08/26 23:47:58 alex Exp $
+ * $Id: irc-server.c,v 1.19 2002/11/05 14:18:59 alex Exp $
  *
  * irc-server.c: IRC-Befehle fuer Server-Links
  */
@@ -32,6 +32,7 @@
 #include "log.h"
 #include "messages.h"
 #include "parse.h"
+#include "ngircd.h"
 
 #include "exp.h"
 #include "irc-server.h"
@@ -92,7 +93,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		{
 			/* Eingehende Verbindung: Unseren SERVER- und PASS-Befehl senden */
 			ok = TRUE;
-			if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd, PASSSERVERADD )) ok = FALSE;
+			if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd, NGIRCd_ProtoID )) ok = FALSE;
 			else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo );
 			if( ! ok )
 			{
@@ -112,6 +113,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), Client_Conn( Client ));
 
 		Client_SetType( Client, CLIENT_SERVER );
+		Conn_SetServer( Client_Conn( Client ), i );
 
 		/* maximalen Hop Count ermitteln */
 		max_hops = 0;
@@ -161,6 +163,15 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		chan = Channel_First( );
 		while( chan )
 		{
+#ifdef IRCPLUS
+			/* Wenn unterstuetzt, CHANINFO senden */
+			if( strchr( Client_Flags( Client ), 'C' ))
+			{
+				/* CHANINFO senden */
+				if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s :%s", Channel_Name( chan ), Channel_Modes( chan ), Channel_Topic( chan ))) return DISCONNECTED;
+			}
+#endif
+
 			/* alle Member suchen */
 			cl2chan = Channel_FirstMember( chan );
 			sprintf( str, "NJOIN %s :", Channel_Name( chan ));
@@ -178,7 +189,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 				if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 8 ))
 				{
 					/* Zeile senden */
-					if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+					if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
 					sprintf( str, "NJOIN %s :", Channel_Name( chan ));
 				}
 				
@@ -189,7 +200,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 			if( str[strlen( str ) - 1] != ':')
 			{
 				/* Ja; Also senden ... */
-				if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+				if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
 			}
 
 			/* naechsten Channel suchen */