X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=2b247a198a138ebc6e7cd9943db59002a58b0599;hb=eef45dbfb90f951f3048038aea3ff68b5c157f6d;hp=a6edb8b7079f3ec8ee53092a0d8299db0704ac93;hpb=2595b35cc2191d33a625d041f31c41ab23156185;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index a6edb8b70..2b247a198 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -89,6 +89,7 @@ class ServerTracker : public SpanningTreeEventListener
 class SASLCap : public Cap::Capability
 {
 	std::string mechlist;
+	const ServerTracker& servertracker;
 
 	bool OnRequest(LocalUser* user, bool adding) CXX11_OVERRIDE
 	{
@@ -100,14 +101,20 @@ class SASLCap : public Cap::Capability
 		return (user->registered != REG_ALL);
 	}
 
+	bool OnList(LocalUser* user) CXX11_OVERRIDE
+	{
+		return servertracker.IsOnline();
+	}
+
 	const std::string* GetValue(LocalUser* user) const CXX11_OVERRIDE
 	{
 		return &mechlist;
 	}
 
  public:
-	SASLCap(Module* mod)
+	SASLCap(Module* mod, const ServerTracker& tracker)
 		: Cap::Capability(mod, "sasl")
+		, servertracker(tracker)
 	{
 	}
 
@@ -238,7 +245,7 @@ class SaslAuthenticator
 
 		SendSASL(params);
 
-		if (parameters[0][0] == '*')
+		if (parameters[0].c_str()[0] == '*')
 		{
 			this->Abort();
 			return false;
@@ -351,7 +358,7 @@ class ModuleSASL : public Module
 	ModuleSASL()
 		: authExt("sasl_auth", ExtensionItem::EXT_USER, this)
 		, servertracker(this)
-		, cap(this)
+		, cap(this, servertracker)
 		, auth(this, authExt, cap)
 		, sasl(this, authExt)
 		, sasleventprov(this, "event/sasl")