From ddc6999a1db1aa1e9bf9df2f1ab444c387bcd5b1 Mon Sep 17 00:00:00 2001
From: Attila Molnar <attilamolnar@hush.com>
Date: Sat, 5 Dec 2015 16:01:30 +0100
Subject: [PATCH] m_sasl Advertise SASL mechanism list to supporting clients

---
 src/modules/m_sasl.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 4d1dbbc71..7570e7732 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -26,6 +26,8 @@
 
 class SASLCap : public Cap::Capability
 {
+	std::string mechlist;
+
 	bool OnRequest(LocalUser* user, bool adding) CXX11_OVERRIDE
 	{
 		// Requesting this cap is allowed anytime
@@ -36,11 +38,25 @@ class SASLCap : public Cap::Capability
 		return (user->registered != REG_ALL);
 	}
 
+	const std::string* GetValue(LocalUser* user) const CXX11_OVERRIDE
+	{
+		return &mechlist;
+	}
+
  public:
 	SASLCap(Module* mod)
 		: Cap::Capability(mod, "sasl")
 	{
 	}
+
+	void SetMechlist(const std::string& newmechlist)
+	{
+		if (mechlist == newmechlist)
+			return;
+
+		mechlist = newmechlist;
+		NotifyValueChange();
+	}
 };
 
 enum SaslState { SASL_INIT, SASL_COMM, SASL_DONE };
@@ -305,6 +321,12 @@ class ModuleSASL : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
+	void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata) CXX11_OVERRIDE
+	{
+		if ((target == NULL) && (extname == "saslmechlist"))
+			cap.SetMechlist(extdata);
+	}
+
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support for IRC Authentication Layer (aka: SASL) via AUTHENTICATE.", VF_VENDOR);
-- 
2.39.2