X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=28bce2bf3c44478fe5cbde604d66847bbf1afc72;hb=5a2af6ded883d71c6c4c9f1497cca1721f8b0742;hp=0fb277b2363d514744028669640570028c826f10;hpb=193eac649066bda33e693baadce6bc40181008f0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 0fb277b23..28bce2bf3 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -104,16 +104,15 @@ class SASLCap : public Cap::Capability
 
 	bool OnRequest(LocalUser* user, bool adding) CXX11_OVERRIDE
 	{
-		// Requesting this cap is allowed anytime
-		if (adding)
-			return true;
-
-		// But removing it can only be done when unregistered
-		return (user->registered != REG_ALL);
+		// Servers MUST NAK any sasl capability request if the authentication layer
+		// is unavailable.
+		return servertracker.IsOnline();
 	}
 
 	bool OnList(LocalUser* user) CXX11_OVERRIDE
 	{
+		// Servers MUST NOT advertise the sasl capability if the authentication layer
+		// is unavailable.
 		return servertracker.IsOnline();
 	}