Make rehash work more than once per run, and fix some uninitialized values in connect classes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11505 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 2 insertions, 4 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 30db77e4d..a6d6e3c85 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1019,8 +1019,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 				}
 				break;
 			}
-			/* We're done with this now */
-			delete Values[Index].val;
 		}
 
 		/* Read the multiple-tag items (class tags, connect tags, etc)
diff --git a/src/users.cpp b/src/users.cpp
index cbc59a49c..d1e3f9172 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -2081,12 +2081,12 @@ bool VisData::VisibleTo(User* user)
 
 
 ConnectClass::ConnectClass(char t, const std::string& mask)
-	: type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), limit(0), RefCount(1)
+	: type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0), RefCount(1)
 {
 }
 
 ConnectClass::ConnectClass(char t, const std::string& mask, const ConnectClass& parent)
-	: type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), limit(parent.limit), RefCount(1)
+	: type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans), port(parent.port), limit(parent.limit), RefCount(1)
 {
 }