X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-mode.c;h=b64a2c0b3c303f701a07c4f98ead863320f44e33;hp=7d7fe45a944b0742f76e11c47b50923d2adb7382;hb=1e59617d2c70ebc4e5008a4233cc759fee715c8f;hpb=296ddebed11c0ded9d5ccc0257485a0ffae9265d

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 7d7fe45a..b64a2c0b 100644
--- 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.16 2002/11/30 15:04:57 alex Exp $
  *
  * irc-mode.c: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...)
  */
@@ -60,9 +60,6 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
 	cl = chan_cl = prefix = NULL;
 	chan = NULL;
 
-	/* Valider Client? */
-	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-
 	/* Keine Parameter? */
 	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -101,6 +98,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 +209,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 +286,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 ));
@@ -414,8 +435,6 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-
 	/* Falsche Anzahl Parameter? */
 	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -447,7 +466,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 +482,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 */