Fixed strange join behavior reported by w00t (mirc requesting MODE immediately after...

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index 4bec1bcdb8b568827723d8a1657120e3da8f5612..05bc7fa0d24623c6d0b010e56670fac5d73cf6bf 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -50,6 +50,7 @@
 #include "message.h"
 #include "mode.h"
 #include "xline.h"
+#include "inspstring.h"
 
 #ifdef GCC3
 #define nspace __gnu_cxx
@@ -60,8 +61,8 @@
 using namespace std;
 
 extern int MODCOUNT;
-extern vector<Module*> modules;
-extern vector<ircd_module*> factory;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
 
 extern int LogLevel;
 extern char ServerName[MAXBUF];
@@ -103,6 +104,7 @@ extern serverrec* me[32];
 
 extern FILE *log_file;
 
+extern time_t TIME;
 
 using namespace std;
 
@@ -127,7 +129,7 @@ void chanrec::SetCustomMode(char mode,bool mode_on)
                m[1] = '\0';
                if (!strchr(this->custom_modes,mode))
                {
-                       strncat(custom_modes,m,MAXMODES);
+                       strlcat(custom_modes,m,MAXMODES);
                }
                log(DEBUG,"Custom mode %c set",mode);
        }
@@ -150,8 +152,8 @@ void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
        log(DEBUG,"SetCustomModeParam called");
        ModeParameter M;
        M.mode = mode;
-       strcpy(M.channel,this->name);
-       strcpy(M.parameter,parameter);
+       strlcpy(M.channel,this->name,CHANMAX);
+       strlcpy(M.parameter,parameter,MAXBUF);
        if (mode_on)
        {
                log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);