Fix another connect class bug on rehash

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 5449a12f6a0810c2f85c88872367c4fe32895385..ca03056c5c35645dbd6fcfeff15e2244dd003cba 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -544,7 +544,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
                        /* Find existing class by mask, the mask should be unique */
                        for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
                        {
-                               if ((*item)->GetHost() == allow)
+                               if ((*item)->GetHost() == allow && !(*item)->GetDisabled())
                                {
                                        (*item)->Update(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
                                        return true;
@@ -560,7 +560,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
                        /* Find existing class by mask, the mask should be unique */
                        for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
                        {
-                               if ((*item)->GetHost() == deny)
+                               if ((*item)->GetHost() == deny && !(*item)->GetDisabled())
                                {
                                        (*item)->Update(name, deny);
                                        (*item)->SetPort(port);