pgsql should now work thx to added posibility to force a fd out of the socketengine...

[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 8f9a850ab5f029f037798caa0396096af313a5ee..7130439e0537ad93e4e3d5a21486b6bb68c425fd 100644 (file)
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -2,13 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *               <omster@gmail.com>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -16,7 +12,6 @@
  */
 
 #include <string>
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
@@ -26,11 +21,13 @@
 #include "m_sqlutils.h"
 
 /* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */
+/* $ModDep: m_sqlv2.h m_sqlutils.h */
 
 class ModuleSQLAuth : public Module
 {
        InspIRCd* Srv;
        Module* SQLutils;
+       Module* SQLprovider;
 
        std::string usertable;
        std::string userfield;
@@ -46,19 +43,20 @@ public:
        ModuleSQLAuth(InspIRCd* Me)
        : Module::Module(Me), Srv(Me)
        {
-               SQLutils = Srv->FindFeature("SQLutils");
-               
-               if(SQLutils)
-               {
-                       ServerInstance->Log(DEBUG, "Successfully got SQLutils pointer");
-               }
-               else
-               {
-                       ServerInstance->Log(DEFAULT, "ERROR: This module requires a module offering the 'SQLutils' feature (usually m_sqlutils.so). Please load it and try again.");
-                       throw ModuleException("This module requires a module offering the 'SQLutils' feature (usually m_sqlutils.so). Please load it and try again.");
-               }
-                               
-               OnRehash("");
+               ServerInstance->UseInterface("SQLutils");
+               ServerInstance->UseInterface("SQL");
+
+               SQLutils = ServerInstance->FindModule("m_sqlutils.so");
+               if (!SQLutils)
+                       throw ModuleException("Can't find m_sqlutils.so. Please load m_sqlutils.so before m_sqlauth.so.");
+
+               OnRehash(NULL,"");
+       }
+
+       virtual ~ModuleSQLAuth()
+       {
+               ServerInstance->DoneWithInterface("SQL");
+               ServerInstance->DoneWithInterface("SQLutils");
        }
 
        void Implements(char* List)
@@ -66,7 +64,7 @@ public:
                List[I_OnUserDisconnect] = List[I_OnCheckReady] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = 1;
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ConfigReader Conf(Srv);
                
@@ -87,18 +85,20 @@ public:
                }
        }       
 
-       virtual void OnUserRegister(userrec* user)
+       virtual int OnUserRegister(userrec* user)
        {
                if ((allowpattern != "") && (Srv->MatchText(user->nick,allowpattern)))
                {
                        user->Extend("sqlauthed");
-                       return;
+                       return 0;
                }
                
                if (!CheckCredentials(user))
                {
                        userrec::QuitUser(Srv,user,killreason);
+                       return 1;
                }
+               return 0;
        }
 
        bool CheckCredentials(userrec* user)
@@ -211,10 +211,6 @@ public:
                return user->GetExt("sqlauthed");
        }
 
-       virtual ~ModuleSQLAuth()
-       {
-       }
-       
        virtual Version GetVersion()
        {
                return Version(1,1,1,0,VF_VENDOR,API_VERSION);