Use a set to mark client SSL ports rather than going by textual IP/port pairs

[user/henk/code/inspircd.git] / src / modules / extra / m_mssql.cpp

diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 39c6daa811e6d5c49f052b1e6270391ea40cb0f0..1ad8a087aa2c9dc984ccb9138de6458e8a66546f 100644 (file)
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -35,7 +35,7 @@ typedef std::deque<MsSQLResult*> ResultQueue;
 unsigned long count(const char * const str, char a)
 {
        unsigned long n = 0;
-       for (const char *p = reinterpret_cast<const char *>(str); *p; ++p)
+       for (const char *p = str; *p; ++p)
        {
                if (*p == '?')
                        ++n;
@@ -668,6 +668,7 @@ class ModuleMsSQL : public Module
 
        virtual ~ModuleMsSQL()
        {
+               queryDispatcher->join();
                delete queryDispatcher;
                ClearQueue();
                ClearAllConnections();
@@ -789,7 +790,7 @@ class ModuleMsSQL : public Module
                }
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                queryDispatcher->LockQueue();
                ReadConf();