- IRC+-Protokoll ist nun abschaltbar.

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

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index c3c4138c6d5bc234c2c66b4d370eff10a2d2688d..64c915378e979cd485a71276091c19490088a9f0 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.12 2002/07/25 12:33:19 alex Exp $
+ * $Id: irc-server.c,v 1.17 2002/09/07 17:57:31 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 ));