albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- fixed up Conf_MaxJoins test on JOIN.

This commit is contained in:
Alexander Barton 2002-12-14 13:23:11 +00:00
parent e907816380
commit 00e75ccd7d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ngircd/irc-channel.c
View File

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: irc-channel.c,v 1.19 2002/12/13 17:53:32 alex Exp $"; static char UNUSED id[] = "$Id: irc-channel.c,v 1.20 2002/12/14 13:23:11 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -83,6 +83,16 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
/* Lokaler Client? */ /* Lokaler Client? */
if( Client_Type( Client ) == CLIENT_USER ) if( Client_Type( Client ) == CLIENT_USER )
{ {
/* Test if the user has reached his maximum channel count */
if( Client_Type( Client ) == CLIENT_USER )
{
if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins ))
{
IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, Client_ID( Client ), channame );
return CONNECTED;
}
}
/* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */ /* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */
if( is_new_chan ) if( is_new_chan )
{ {
@ -95,17 +105,6 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
chan = Channel_Search( channame ); chan = Channel_Search( channame );
assert( chan != NULL ); assert( chan != NULL );
/* Test if the user has reached his maximum channel count */
if( Client_Type( Client ) == CLIENT_USER )
{
if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( chan, Client ) > Conf_MaxJoins ))
{
IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, Client_ID( Client ), channame );
return CONNECTED;
}
}
is_banned = Lists_CheckBanned( target, chan ); is_banned = Lists_CheckBanned( target, chan );
is_invited = Lists_CheckInvited( target, chan ); is_invited = Lists_CheckInvited( target, chan );