userrec and chanrec now have their own independent pointer back to their 'creator' InspIRCd* object, extern now longer required in channels.cpp or users.cpp

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

2 files changed, 7 insertions, 3 deletions

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index da7559914..08068db59 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -29,6 +29,8 @@ using namespace std;
 #include "helperfuncs.h"
 #include "inspircd.h"
 
+extern InspIRCd* ServerInstance;
+
 class FilterPCREException : public ModuleException
 {
  public:
@@ -145,7 +147,7 @@ class ModuleFilterPCRE : public Module
 
 				if (do_action == "kill")
 				{
-					userrec::QuitUser(user,reason);
+					userrec::QuitUser(ServerInstance,user,reason);
 				}
 				return 1;
 			}
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index e6878777d..93d763cb5 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -27,6 +27,8 @@
 
 /* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */
 
+extern InspIRCd* ServerInstance;
+
 class ModuleSQLAuth : public Module
 {
 	Server* Srv;
@@ -94,7 +96,7 @@ public:
 		
 		if (!CheckCredentials(user))
 		{
-			userrec::QuitUser(user,killreason);
+			userrec::QuitUser(ServerInstance,user,killreason);
 		}
 	}
 
@@ -202,7 +204,7 @@ public:
 	{
 		if(user->GetExt("sqlauth_failed"))
 		{
-			userrec::QuitUser(user,killreason);
+			userrec::QuitUser(ServerInstance,user,killreason);
 			return false;
 		}