- Parameter von List_Add{Invited|Banned}() erweitert.

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 52f59d30caf7f7964650ac153684b1e2d3f4aff9..f018b0e3137fc8b244237c57d601eabe80fe687e 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.13 2002/09/08 01:38:36 alex Exp $
+ * $Id: irc-mode.c,v 1.14 2002/09/08 17:07:14 alex Exp $
  *
  * irc-mode.c: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...)
  */
@@ -467,7 +467,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 +483,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 */
 

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index d8d70c5f15ce13bed40ca3f465e55a77955fa5d0..cd2b823574df79d73bdf3fc226919017016687d7 100644 (file)
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.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-op.c,v 1.8 2002/09/08 00:52:39 alex Exp $
+ * $Id: irc-op.c,v 1.9 2002/09/08 17:06:54 alex Exp $
  *
  * irc-op.c: Befehle zur Channel-Verwaltung
  */
@@ -112,7 +112,7 @@ IRC_INVITE( CLIENT *Client, REQUEST *Req )
        Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] );
        if( remember )
        {
-               if( ! Lists_AddInvited( Client_Mask( target ), chan, TRUE )) return CONNECTED;
+               if( ! Lists_AddInvited( from, Client_Mask( target ), chan, TRUE )) return CONNECTED;
        }
        
        /* an Ziel-Client forwarden ... */

diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h
index 166a1d4654a05e462fc394b094d2a36a7d8c9727..5d500a5a6d24c4815a84bdd6a8768ff46993d1d0 100644 (file)
--- a/src/ngircd/lists.h
+++ b/src/ngircd/lists.h
@@ -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: lists.h,v 1.7 2002/09/08 00:56:14 alex Exp $
+ * $Id: lists.h,v 1.8 2002/09/08 17:05:25 alex Exp $
  *
  * lists.h: Verwaltung der "IRC-Listen": Ban, Invite, ... (Header)
  */
@@ -23,12 +23,12 @@ GLOBAL VOID Lists_Init PARAMS(( VOID ));
 GLOBAL VOID Lists_Exit PARAMS(( VOID ));
 
 GLOBAL BOOLEAN Lists_CheckInvited PARAMS(( CLIENT *Client, CHANNEL *Chan ));
-GLOBAL BOOLEAN Lists_AddInvited PARAMS(( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce ));
+GLOBAL BOOLEAN Lists_AddInvited PARAMS(( CLIENT *From, CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce ));
 GLOBAL VOID Lists_DelInvited PARAMS(( CHAR *Mask, CHANNEL *Chan ));
 GLOBAL BOOLEAN Lists_ShowInvites PARAMS(( CLIENT *Client, CHANNEL *Channel ));
 
 GLOBAL BOOLEAN Lists_CheckBanned PARAMS(( CLIENT *Client, CHANNEL *Chan ));
-GLOBAL BOOLEAN Lists_AddBanned PARAMS(( CHAR *Mask, CHANNEL *Chan ));
+GLOBAL BOOLEAN Lists_AddBanned PARAMS(( CLIENT *From, CHAR *Mask, CHANNEL *Chan ));
 GLOBAL VOID Lists_DelBanned PARAMS(( CHAR *Mask, CHANNEL *Chan ));
 GLOBAL BOOLEAN Lists_ShowBans PARAMS(( CLIENT *Client, CHANNEL *Channel ));