- CHANINFO wird auf Server-Links gesendet, wenn unterstuetzt.

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

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index 12de0815c3d48eb60f5629d303924ce458135d3c..2ed347ba9a188c67c10fcea392b5ed3a22b5148a 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.13 2002/08/26 23:39:22 alex Exp $
+ * $Id: irc-server.c,v 1.16 2002/09/03 23:55:44 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,13 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                chan = Channel_First( );
                while( chan )
                {
+                       /* 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;
+                       }
+                       
                        /* alle Member suchen */
                        cl2chan = Channel_FirstMember( chan );
                        sprintf( str, "NJOIN %s :", Channel_Name( chan ));
@@ -299,7 +307,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
                                IRC_WriteStrChannelPrefix( Client, chan, Client, FALSE, "MODE %s +%s %s", channame, modes, Client_ID( c ));
                        }
                }
-               else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\", channel \"%s\"!", ptr, channame );
+               else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );
                
                /* naechsten Nick suchen */
                ptr = strtok( NULL, "," );