Changed two fields in ConnectClass to strings, moved constructor stuff to init-list

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index c1a53b908614115108184a90ce6a342e6111fe10..3bc2bb79aed664196b9a4bf46d4c1f8ffd0996f1 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -130,7 +130,6 @@ void Write(int sock,char *text, ...)
                 log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
                 return;
         }
-       log(DEBUG,"Write: Normal");
         va_list argsPtr;
        char textbuffer[MAXBUF],tb[MAXBUF];
         va_start (argsPtr, text);
@@ -142,7 +141,6 @@ void Write(int sock,char *text, ...)
         {
                if (Config->GetIOHook(fd_ref_table[sock]->port))
                {
-                       log(DEBUG,"Write: IO Hooked");
                        Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
                }
                else
@@ -165,7 +163,6 @@ void WriteServ(int sock, char* text, ...)
                 log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter");
                 return;
         }
-       log(DEBUG,"WriteServ: normal");
         va_list argsPtr;
         va_start (argsPtr, text);
        char textbuffer[MAXBUF],tb[MAXBUF];
@@ -177,7 +174,6 @@ void WriteServ(int sock, char* text, ...)
         {
                if (Config->GetIOHook(fd_ref_table[sock]->port))
                {
-                       log(DEBUG,"WriteServ: IO Hooked");
                        Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
                }
                else
@@ -200,7 +196,6 @@ void WriteFrom(int sock, userrec *user,char* text, ...)
                 log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter");
                 return;
         }
-       log(DEBUG,"WriteFrom: normal");
         va_list argsPtr;
         va_start (argsPtr, text);
        char textbuffer[MAXBUF],tb[MAXBUF];
@@ -212,7 +207,6 @@ void WriteFrom(int sock, userrec *user,char* text, ...)
         {
                if (Config->GetIOHook(fd_ref_table[sock]->port))
                {
-                       log(DEBUG,"WriteFrom: IO hooked");
                        Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
                }
                else
@@ -928,9 +922,9 @@ char* Passwd(userrec *user)
 {
         for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
         {
-                if ((i->type == CC_ALLOW) && match(user->host,i->host))
+                if ((i->type == CC_ALLOW) && match(user->host,i->host.c_str()))
                 {
-                        return i->pass;
+                        return (char*)i->pass.c_str();
                 }
         }
         return "";
@@ -940,7 +934,7 @@ bool IsDenied(userrec *user)
 {
         for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
         {
-                if ((i->type == CC_DENY) && match(user->host,i->host))
+                if ((i->type == CC_DENY) && match(user->host,i->host.c_str()))
                 {
                         return true;
                 }