- ausgehende Verbindungen mit ID 0 konnten nicht aufgebaut werden ... :-/

[ngircd-alex.git] / src / ngircd / irc-server.c

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index aafafe688c8c54275703ba15aed92b943bc957e7..a9dde9ed15409267846fc63f61f1fa7dc2297691 100644 (file)
--- 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.18 2002/10/04 11:21:46 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 )
                        {
@@ -161,6 +162,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 +188,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 +199,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 */