- fixed broken handling of modes received from other servers.
authorAlexander Barton <alex@barton.de>
Mon, 16 Dec 2002 10:52:53 +0000 (10:52 +0000)
committerAlexander Barton <alex@barton.de>
Mon, 16 Dec 2002 10:52:53 +0000 (10:52 +0000)
src/ngircd/irc-mode.c

index d633a426ad16f01b4160b3db2f85ff4d260b22f9..381811e456c5ee6a3830e22fee44c1a7c23eca8f 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-mode.c,v 1.21 2002/12/15 16:29:18 alex Exp $";
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.22 2002/12/16 10:52:53 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -148,45 +148,36 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                                continue;
                }
                
+               /* Validate modes */
                x[0] = '\0';
-               if( Client_Type( Client ) == CLIENT_SERVER )
-               {
-                       /* MODE request was received from a server:
-                        * therefore don't validate but trust it! */
-                       x[0] = *mode_ptr;
-               }
-               else
+               switch( *mode_ptr )
                {
-                       /* Validate modes */
-                       switch( *mode_ptr )
-                       {
-                               case 'i':
-                                       /* Invisible */
-                                       x[0] = 'i';
-                                       break;
-                               case 'o':
-                                       /* IRC operator (only unsetable!) */
-                                       if( ! set )
-                                       {
-                                               Client_SetOperByMe( Target, FALSE );
-                                               x[0] = 'o';
-                                       }
-                                       else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
-                                       break;
-                               case 'r':
-                                       /* Restricted (only setable) */
-                                       if( set ) x[0] = 'r';
-                                       else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin ));
-                                       break;
-                               case 's':
-                                       /* Server messages */
-                                       x[0] = 's';
-                                       break;
-                               default:
-                                       Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ));
-                                       ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
-                                       x[0] = '\0';
-                       }
+                       case 'i':
+                               /* Invisible */
+                               x[0] = 'i';
+                               break;
+                       case 'o':
+                               /* IRC operator (only unsetable!) */
+                               if( ! set )
+                               {
+                                       Client_SetOperByMe( Target, FALSE );
+                                       x[0] = 'o';
+                               }
+                               else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
+                               break;
+                       case 'r':
+                               /* Restricted (only setable) */
+                               if( set ) x[0] = 'r';
+                               else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin ));
+                               break;
+                       case 's':
+                               /* Server messages */
+                               x[0] = 's';
+                               break;
+                       default:
+                               Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ));
+                               if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
+                               x[0] = '\0';
                }
                if( ! ok ) break;
 
@@ -315,113 +306,104 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                /* Are there arguments left? */
                if( arg_arg >= Req->argc ) arg_arg = -1;
 
+               /* Validate modes */
                x[0] = '\0';
                client = NULL;
-               if( Client_Type( Client ) == CLIENT_SERVER )
-               {
-                       /* MODE request was received from a server:
-                        * therefore don't validate but trust it! */
-                       x[0] = *mode_ptr;
-               }
-               else
+               switch( *mode_ptr )
                {
-                       /* Validate modes */
-                       switch( *mode_ptr )
-                       {
-                               /* Channel modes */
-                               case 'i':
-                                       /* Invite-Only */
-                                       if( modeok ) x[0] = 'i';
-                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
-                                       break;
-                               case 'm':
-                                       /* Moderated */
-                                       if( modeok ) x[0] = 'm';
-                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
-                                       break;
-                               case 'n':
-                                       /* kein Schreiben in den Channel von aussen */
-                                       if( modeok ) x[0] = 'n';
-                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
-                                       break;
-                               case 't':
-                                       /* Topic Lock */
-                                       if( modeok ) x[0] = 't';
-                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
-                                       break;
-                               case 'P':
-                                       /* Persistent channel */
-                                       if( modeok )
+                       /* Channel modes */
+                       case 'i':
+                               /* Invite-Only */
+                               if( modeok ) x[0] = 'i';
+                               else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                               break;
+                       case 'm':
+                               /* Moderated */
+                               if( modeok ) x[0] = 'm';
+                               else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                               break;
+                       case 'n':
+                               /* kein Schreiben in den Channel von aussen */
+                               if( modeok ) x[0] = 'n';
+                               else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                               break;
+                       case 't':
+                               /* Topic Lock */
+                               if( modeok ) x[0] = 't';
+                               else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                               break;
+                       case 'P':
+                               /* Persistent channel */
+                               if( modeok )
+                               {
+                                       if( set && ( ! Client_OperByMe( Client )))
                                        {
-                                               if( set && ( ! Client_OperByMe( Client )))
-                                               {
-                                                       /* Only IRC operators are allowed to set P mode */
-                                                       ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
-                                               }
-                                               else x[0] = 'P';
+                                               /* Only IRC operators are allowed to set P mode */
+                                               ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
                                        }
-                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
-                                       break;
-
-                               /* Channel user modes */
-                               case 'o':
-                                       /* Channel operator */
-                               case 'v':
-                                       /* Voice */
-                                       if( arg_arg > mode_arg )
+                                       else x[0] = 'P';
+                               }
+                               else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                               break;
+
+                       /* Channel user modes */
+                       case 'o':
+                               /* Channel operator */
+                       case 'v':
+                               /* Voice */
+                               if( arg_arg > mode_arg )
+                               {
+                                       if( modeok )
                                        {
-                                               if( modeok )
-                                               {
-                                                       client = Client_Search( Req->argv[arg_arg] );
-                                                       if( client ) x[0] = *mode_ptr;
-                                                       else ok = IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[arg_arg] );
-                                               }
-                                               else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
-                                               Req->argv[arg_arg][0] = '\0';
-                                               arg_arg++;
+                                               client = Client_Search( Req->argv[arg_arg] );
+                                               if( client ) x[0] = *mode_ptr;
+                                               else ok = IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[arg_arg] );
                                        }
-                                       else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
-                                       break;
+                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                                       Req->argv[arg_arg][0] = '\0';
+                                       arg_arg++;
+                               }
+                               else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+                               break;
 
-                               /* Channel lists */
-                               case 'I':
-                                       /* Invite lists */
-                                       if( arg_arg > mode_arg )
+                       /* Channel lists */
+                       case 'I':
+                               /* Invite lists */
+                               if( arg_arg > mode_arg )
+                               {
+                                       /* modify list */
+                                       if( modeok )
                                        {
-                                               /* modify list */
-                                               if( modeok )
-                                               {
-                                                       if( set ) Add_Invite( Origin, Client, Channel, Req->argv[arg_arg] );
-                                                       else Del_Invite( Origin, Client, Channel, Req->argv[arg_arg] );
-                                               }
-                                               else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
-                                               Req->argv[arg_arg][0] = '\0';
-                                               arg_arg++;
+                                               if( set ) Add_Invite( Origin, Client, Channel, Req->argv[arg_arg] );
+                                               else Del_Invite( Origin, Client, Channel, Req->argv[arg_arg] );
                                        }
-                                       else Lists_ShowInvites( Origin, Channel );
-                                       break;
-                               case 'b':
-                                       /* Ban lists */
-                                       if( arg_arg > mode_arg )
+                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                                       Req->argv[arg_arg][0] = '\0';
+                                       arg_arg++;
+                               }
+                               else Lists_ShowInvites( Origin, Channel );
+                               break;
+                       case 'b':
+                               /* Ban lists */
+                               if( arg_arg > mode_arg )
+                               {
+                                       /* modify list */
+                                       if( modeok )
                                        {
-                                               /* modify list */
-                                               if( modeok )
-                                               {
-                                                       if( set ) Add_Ban( Origin, Client, Channel, Req->argv[arg_arg] );
-                                                       else Del_Ban( Origin, Client, Channel, Req->argv[arg_arg] );
-                                               }
-                                               else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
-                                               Req->argv[arg_arg][0] = '\0';
-                                               arg_arg++;
+                                               if( set ) Add_Ban( Origin, Client, Channel, Req->argv[arg_arg] );
+                                               else Del_Ban( Origin, Client, Channel, Req->argv[arg_arg] );
                                        }
-                                       else Lists_ShowBans( Origin, Channel );
-                                       break;
+                                       else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+                                       Req->argv[arg_arg][0] = '\0';
+                                       arg_arg++;
+                               }
+                               else Lists_ShowBans( Origin, Channel );
+                               break;
 
-                               default:
-                                       Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\" on %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ), Channel_Name( Channel ));
-                                       ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
-                                       x[0] = '\0';
-                       }
+                       default:
+                               Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\" on %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ), Channel_Name( Channel ));
+                               if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
+                               x[0] = '\0';
                }
                if( ! ok ) break;