Handle database not present a bit better, add missing MySQL rehash on init

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

1 files changed, 14 insertions, 6 deletions

diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 92e402811..bded0ea04 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -146,19 +146,27 @@ public:
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("sqloper");
 
-		SQL.SetProvider("SQL/" + tag->getString("dbid"));
-		SQL.lookup();
+		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;
 	}