- Channel-Mode "P" ("persistent") kann nur noch von IRC-Ops gesetzt werden.

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

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 7d7fe45a944b0742f76e11c47b50923d2adb7382..77670d19dfe5bada810283d15fbe8b778f4e2ef6 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.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-mode.c,v 1.12 2002/09/08 01:16:58 alex Exp $
+ * $Id: irc-mode.c,v 1.15 2002/11/22 18:28:22 alex Exp $
  *
  * irc-mode.c: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...)
  */
@@ -101,6 +101,26 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
                }
                else
                {
+                       /* Listen veraendern */
+
+                       if( Client_Type( Client ) == CLIENT_USER )
+                       {
+                               /* Ist der User Channel-Operator? */
+                               modeok = FALSE;
+                               if( strchr( Channel_UserModes( chan, Client ), 'o' )) modeok = TRUE;
+                               if( Conf_OperCanMode )
+                               {
+                                       /* auch IRC-Operatoren duerfen MODE verwenden */
+                                       if( Client_OperByMe( Client )) modeok = TRUE;
+                               }
+
+                               if( ! modeok )
+                               {
+                                       Log( LOG_DEBUG, "Can't change modes: \"%s\" is not operator on %s!", Client_ID( Client ), Channel_Name( chan ));
+                                       return IRC_WriteStrClient( Client, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Client ), Channel_Name( chan ));
+                               }
+                       }
+                       
                        if( Req->argv[1][0] == '+' )
                        {
                                /* Listen-Eintrag hinzufuegen */
@@ -192,7 +212,7 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
                                                        Client_SetOperByMe( Client, FALSE );
                                                        x[0] = 'o';
                                                }
-                                               else ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client ));
+                                               else ok = IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
                                                break;
                                        case 'r':
                                                /* restricted (kann nur gesetzt werden) */
@@ -269,8 +289,12 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
                                                        x[0] = 't';
                                                        break;
                                                case 'P':
-                                                       /* Persistent */
-                                                       x[0] = 'P';
+                                                       /* Persistent. Dieses Flag darf nur von IRC-Operatoren gesetzt werden! */
+                                                       if( set && ( ! Client_OperByMe( Client )))
+                                                       {
+                                                               ok = IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+                                                       }
+                                                       else x[0] = 'P';
                                                        break;
                                                default:
                                                        Log( LOG_DEBUG, "Unknown channel-mode \"%c%c\" from \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Channel_Name( chan ));
@@ -447,7 +471,7 @@ Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 
        mask = Lists_MakeMask( Pattern );
 
-       if( ! Lists_AddInvited( mask, Channel, FALSE )) return CONNECTED;
+       if( ! Lists_AddInvited( Prefix, mask, Channel, FALSE )) return CONNECTED;
        return Send_ListChange( "+I", Prefix, Client, Channel, mask );
 } /* Add_Invite */
 
@@ -463,7 +487,7 @@ Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
 
        mask = Lists_MakeMask( Pattern );
 
-       if( ! Lists_AddBanned( mask, Channel )) return CONNECTED;
+       if( ! Lists_AddBanned( Prefix, mask, Channel )) return CONNECTED;
        return Send_ListChange( "+b", Prefix, Client, Channel, mask );
 } /* Add_Ban */