Add requiresasl to connect block checks

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

1 files changed, 13 insertions, 2 deletions

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 28a583c80..4dcb350bc 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -226,8 +226,8 @@ class ModuleSASL : public Module
 	ModuleSASL()
 		: authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt)
 	{
-		Implementation eventlist[] = { I_OnEvent, I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnSetConnectClass };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 
 		ServiceProvider* providelist[] = { &auth, &sasl, &authExt };
 		ServerInstance->Modules->AddServices(providelist, 3);
@@ -248,6 +248,17 @@ class ModuleSASL : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
+	ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
+	{
+		if (myclass->config->getBool("requiresasl"))
+		{
+			AccountExtItem* ext = GetAccountExtItem();
+			if (ext && !ext.get(user))
+				return MOD_RES_DENY;
+		}
+		return MOD_RES_PASSTHRU;
+	}
+
 	~ModuleSASL()
 	{
 	}