- fixed up Conf_MaxJoins test on JOIN.

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 23f1bf91a9b399a1f5f7880a32b37da2457f3a56..528751e48d0f013291ace866a66f071323f78967 100644 (file)
--- 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.20 2002/12/14 13:23:11 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"
@@ -82,6 +83,16 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
                /* Lokaler Client? */
                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? */
                        if( is_new_chan )
                        {