- CHANINFO: Fixed up broken fix ...

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 58ee4648f9096389bf2fc21ffe02f2fa4786892d..2b4dc42d1b4a44690d398c5f607234baf823c84e 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.21.2.2 2003/01/08 17:47:48 alex Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.21.2.3 2003/01/08 20:22:57 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -365,18 +365,24 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
        CLIENT *from;
        CHANNEL *chan;
        CHAR *ptr;
+       INT arg_topic;
 
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Falsche Anzahl Parameter? */
-       if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+       /* Bad number of parameters? */
+       if(( Req->argc < 1 ) || ( Req->argc > 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+       /* Compatibility kludge */
+       if( Req->argc == 5 ) arg_topic = 5;
+       else if( Req->argc == 3 ) arg_topic = 3;
+       else arg_topic = -1;
 
-       /* From-Server suchen */
+       /* Search origin */
        from = Client_Search( Req->prefix );
        if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
-       /* Channel suchen bzw. erzeugen */
+       /* Search or create channel */
        chan = Channel_Search( Req->argv[0] );
        if( ! chan ) chan = Channel_Create( Req->argv[0] );
        if( ! chan ) return CONNECTED;
@@ -388,29 +394,34 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
                {
                        /* OK, this channel doesn't have modes jet, set the received ones: */
                        Channel_SetModes( chan, &Req->argv[1][1] );
-                       IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s", Req->argv[0], &Req->argv[1][1] );
 
                        /* Delete modes which we never want to inherit */
                        Channel_ModeDel( chan, 'l' );
                        Channel_ModeDel( chan, 'k' );
+
+                       /* Inform members of this channel */
+                       IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s", Req->argv[0], Channel_Modes( chan ));
                }
        }
        else Log( LOG_WARNING, "CHANNELINFO: invalid MODE format ignored!" );
 
-       if( Req->argc == 3 )
+       if( arg_topic > 0 )
        {
-               /* Es wurde auch ein Topic mit uebermittelt */
+               /* We got a topic */
                ptr = Channel_Topic( chan );
                if( ! *ptr )
                {
-                       /* OK, es ist bisher kein Topic gesetzt */
-                       Channel_SetTopic( chan, Req->argv[2] );
-                       IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[2] );
+                       /* OK, there is no topic jet */
+                       Channel_SetTopic( chan, arg_topic );
+                       IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Channel_Topic( chan ));
                }
        }
 
-       /* an andere Server forwarden */
-       IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] );
+       /* Forward CHANINFO to other serevrs */
+       if( Req->argc == 5 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2], Req->argv[3], Req->argv[4] );
+       else if( Req->argc == 3 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] );
+       else IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s", Req->argv[0], Req->argv[1] );
+
        return CONNECTED;
 } /* IRC_CHANINFO */