Try this as the ssl crash fix

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

diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index efbc39825672b5e8cc4bdee8a1ad8eeeb57d6d13..4d0cc6a761139b572f11118b881d19d7e184aab9 100644 (file)
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -85,38 +85,32 @@ public:
                return 0;
        }
 
-       void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace)
-       {
-               std::string::size_type x = newline.find(find);
-               while (x != std::string::npos)
-               {
-                       newline.erase(x, find.length());
-                       if (!replace.empty())
-                               newline.insert(x, replace);
-                       x = newline.find(find);
-               }
-       }
-
        bool CheckCredentials(User* user)
        {
                std::string thisquery = freeformquery;
                std::string safepass = user->password;
+               std::string safegecos = user->fullname;
 
                /* Search and replace the escaped nick and escaped pass into the query */
 
-               SearchAndReplace(safepass, "\"", "");
+               SearchAndReplace(safepass, std::string("\""), std::string("\\\""));
+               SearchAndReplace(safegecos, std::string("\""), std::string("\\\""));
 
-               SearchAndReplace(thisquery, "$nick", user->nick);
-               SearchAndReplace(thisquery, "$pass", safepass);
-               SearchAndReplace(thisquery, "$host", user->host);
-               SearchAndReplace(thisquery, "$ip", user->GetIPString());
+               SearchAndReplace(thisquery, std::string("$nick"), user->nick);
+               SearchAndReplace(thisquery, std::string("$pass"), safepass);
+               SearchAndReplace(thisquery, std::string("$host"), user->host);
+               SearchAndReplace(thisquery, std::string("$ip"), std::string(user->GetIPString()));
+               SearchAndReplace(thisquery, std::string("$gecos"), safegecos);
+               SearchAndReplace(thisquery, std::string("$ident"), user->ident);
+               SearchAndReplace(thisquery, std::string("$server"), std::string(user->server));
+               SearchAndReplace(thisquery, std::string("$uuid"), user->uuid);
 
                Module* HashMod = ServerInstance->Modules->Find("m_md5.so");
 
                if (HashMod)
                {
                        HashResetRequest(this, HashMod).Send();
-                       SearchAndReplace(thisquery, "$md5pass", HashSumRequest(this, HashMod, user->password).Send());
+                       SearchAndReplace(thisquery, std::string("$md5pass"), std::string(HashSumRequest(this, HashMod, user->password).Send()));
                }
 
                HashMod = ServerInstance->Modules->Find("m_sha256.so");
@@ -124,7 +118,7 @@ public:
                if (HashMod)
                {
                        HashResetRequest(this, HashMod).Send();
-                       SearchAndReplace(thisquery, "$sha256pass", HashSumRequest(this, HashMod, user->password).Send());
+                       SearchAndReplace(thisquery, std::string("$sha256pass"), std::string(HashSumRequest(this, HashMod, user->password).Send()));
                }
 
                /* Build the query */