Merge pull request #1147 from SaberUK/insp20+gcc6

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

diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 66fb0550e824c363a96e2ebdf2ab12c0736e3a06..ae581cc4b61e3b36a98962291c41243545ff77f9 100644 (file)
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "sql.h"
 #include "hash.h"
@@ -35,15 +41,14 @@ class OpMeQuery : public SQLQuery
 {
  public:
        const std::string uid, username, password;
-       OpMeQuery(Module* me, const std::string& db, const std::string& q, const std::string& u, const std::string& un, const std::string& pw)
-               : SQLQuery(me, db, q), uid(u), username(un), password(pw)
+       OpMeQuery(Module* me, const std::string& u, const std::string& un, const std::string& pw)
+               : SQLQuery(me), uid(u), username(un), password(pw)
        {
-               ServerInstance->Logs->Log("m_sqloper",DEBUG, "SQLOPER: db=%s query=\"%s\"", db.c_str(), q.c_str());
        }
 
        void OnResult(SQLResult& res)
        {
-               ServerInstance->Logs->Log("m_sqloper",DEBUG, "SQLOPER: result on db=%s for %s", dbid.c_str(), uid.c_str());
+               ServerInstance->Logs->Log("m_sqloper",DEBUG, "SQLOPER: result for %s", uid.c_str());
                User* user = ServerInstance->FindNick(uid);
                if (!user)
                        return;
@@ -114,7 +119,7 @@ class OpMeQuery : public SQLQuery
 
                hostname.append("@").append(user->host);
 
-               if (OneOfMatches(hostname.c_str(), user->GetIPString(), pattern.c_str()))
+               if (OneOfMatches(hostname.c_str(), user->GetIPString(), pattern))
                {
                        /* Opertype and host match, looks like this is it. */
 
@@ -128,7 +133,6 @@ class OpMeQuery : public SQLQuery
 
 class ModuleSQLOper : public Module
 {
-       std::string databaseid;
        std::string query;
        std::string hashtype;
        dynamic_reference<SQLProvider> SQL;
@@ -141,25 +145,34 @@ public:
                OnRehash(NULL);
 
                Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        void OnRehash(User* user)
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("sqloper");
 
-               databaseid = tag->getString("dbid");
+               std::string dbid = tag->getString("dbid");
+               if (dbid.empty())
+                       SQL.SetProvider("SQL");
+               else
+                       SQL.SetProvider("SQL/" + dbid);
+
                hashtype = tag->getString("hash");
                query = tag->getString("query", "SELECT hostname as host, type FROM ircd_opers WHERE username='$username' AND password='$password'");
        }
 
        ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
        {
-               if (validated && command == "OPER" && parameters.size() == 2 && SQL)
+               if (validated && command == "OPER" && parameters.size() >= 2)
                {
-                       LookupOper(user, parameters[0], parameters[1]);
-                       /* Query is in progress, it will re-invoke OPER if needed */
-                       return MOD_RES_DENY;
+                       if (SQL)
+                       {
+                               LookupOper(user, parameters[0], parameters[1]);
+                               /* Query is in progress, it will re-invoke OPER if needed */
+                               return MOD_RES_DENY;
+                       }
+                       ServerInstance->Logs->Log("m_sqloper",DEFAULT, "SQLOPER: database not present");
                }
                return MOD_RES_PASSTHRU;
        }
@@ -173,7 +186,7 @@ public:
                userinfo["username"] = username;
                userinfo["password"] = hash ? hash->hexsum(password) : password;
 
-               SQL->submit(new OpMeQuery(this, databaseid, SQL->FormatQuery(query, userinfo), user->uuid, username, password));
+               SQL->submit(new OpMeQuery(this, user->uuid, username, password), query, userinfo);
        }
 
        Version GetVersion()