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=77670d19dfe5bada810283d15fbe8b778f4e2ef6;hp=52f59d30caf7f7964650ac153684b1e2d3f4aff9;hb=085a03d10765a1ceeb164d01dc2a99ac36d14619;hpb=c2aefbb3e138c61429f7f578c4303f0c2d22ee7f

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 52f59d30..77670d19 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.13 2002/09/08 01:38:36 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, ...)
  */
@@ -212,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) */
@@ -289,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 ));
@@ -467,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 */
 
@@ -483,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 */