From 81a26d988af12111ab5a83173268f3ae79fe421e Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Mon, 15 Jul 2002 16:35:21 +0000 Subject: [PATCH] - Lists_AddInvited() kann nun einen Fehler liefern. --- src/ngircd/irc-op.c | 7 +++++-- src/ngircd/lists.c | 7 ++++--- src/ngircd/lists.h | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 8bc38307..e4263109 100644 --- 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.5 2002/06/11 13:59:07 alex Exp $ + * $Id: irc-op.c,v 1.6 2002/07/15 16:35:21 alex Exp $ * * irc-op.c: Befehle zur Channel-Verwaltung */ @@ -124,8 +124,11 @@ 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; + } IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] ); - if( remember ) Lists_AddInvited( Client_Mask( target ), chan, TRUE ); if( Client_Conn( target ) > NONE ) { diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index d4b0a143..96a7ce64 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.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: lists.c,v 1.3 2002/06/09 13:18:23 alex Exp $ + * $Id: lists.c,v 1.4 2002/07/15 16:35:21 alex Exp $ * * lists.c: Verwaltung der "IRC-Listen": Ban, Invite, ... */ @@ -123,7 +123,7 @@ Lists_CheckInvited( CLIENT *Client, CHANNEL *Chan ) } /* Lists_CheckInvited */ -GLOBAL VOID +GLOBAL BOOLEAN Lists_AddInvited( CHAR *Pattern, CHANNEL *Chan, BOOLEAN OnlyOnce ) { C2C *c2c; @@ -135,7 +135,7 @@ Lists_AddInvited( CHAR *Pattern, CHANNEL *Chan, BOOLEAN OnlyOnce ) if( ! c2c ) { Log( LOG_ERR, "Can't add new invite list entry!" ); - return; + return FALSE; } /* verketten */ @@ -143,6 +143,7 @@ Lists_AddInvited( CHAR *Pattern, CHANNEL *Chan, BOOLEAN OnlyOnce ) My_Invites = c2c; Log( LOG_DEBUG, "Added \"%s\" to invite list for \"%s\".", Pattern, Channel_Name( Chan )); + return TRUE; } /* Lists_AddInvited */ diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index 366f075e..f00bca11 100644 --- 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.3 2002/06/09 13:18:40 alex Exp $ + * $Id: lists.h,v 1.4 2002/07/15 16:35:21 alex Exp $ * * lists.h: Verwaltung der "IRC-Listen": Ban, Invite, ... (Header) */ @@ -23,7 +23,7 @@ GLOBAL VOID Lists_Init PARAMS(( VOID )); GLOBAL VOID Lists_Exit PARAMS(( VOID )); GLOBAL BOOLEAN Lists_CheckInvited PARAMS(( CLIENT *Client, CHANNEL *Chan )); -GLOBAL VOID Lists_AddInvited PARAMS(( CHAR *Pattern, CHANNEL *Chan, BOOLEAN OnlyOnce )); +GLOBAL BOOLEAN Lists_AddInvited PARAMS(( CHAR *Pattern, CHANNEL *Chan, BOOLEAN OnlyOnce )); GLOBAL BOOLEAN Lists_CheckBanned PARAMS(( CLIENT *Client, CHANNEL *Chan )); -- 2.39.2