X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=52e245190d40ec8eca2addb0edb816575589056a;hp=23f1bf91a9b399a1f5f7880a32b37da2457f3a56;hb=5b8b3b83843d121b09b076876612e343d02c9d36;hpb=1e59617d2c70ebc4e5008a4233cc759fee715c8f

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 23f1bf91..52e24519 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -2,21 +2,20 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: irc-channel.c,v 1.16 2002/11/30 15:04:57 alex Exp $
- *
- * irc-channel.c: IRC-Channel-Befehle
+ * IRC channel commands
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.19 2002/12/13 17:53:32 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
@@ -30,8 +29,10 @@
 #include "match.h"
 #include "messages.h"
 #include "parse.h"
-#include "irc.h"
+#include "irc-info.h"
 #include "irc-write.h"
+#include "resolve.h"
+#include "conf.h"
 
 #include "exp.h"
 #include "irc-channel.h"
@@ -94,6 +95,17 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 				chan = Channel_Search( channame );
 				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_invited = Lists_CheckInvited( target, chan );