diff options
| author |  Sadie Powell | 2024-03-24 21:34:48 +0000 |
|---|---|---|
| committer | Sadie Powell | 2024-03-24 21:38:25 +0000 |
| commit | 4931b94e96c1f1a490c6fa44bf9e727dad82ab00 (patch) | |
| tree | a228f8f2f5a5cbdcdfb6c4799fde5b0d88c4e66b /src/modules/m_sasl.cpp | |
| parent | Use ERR_RESTRICTED instead of ERR_BANNEDFROMCHAN in restrictchans. (diff) | |
Only abort SASL sessions if the user is using sasl-3.1.
This is a compromise to allow modern clients to authenticate
quickly whilst not breaking old clients.
This reverts commit 4b8e69882e8b591102bfb03da1425b04c43272de.
Diffstat (limited to 'src/modules/m_sasl.cpp')
| -rw-r--r-- | src/modules/m_sasl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 258c2f92e..d95edd469 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -409,7 +409,6 @@ private: CommandAuthenticate auth; CommandSASL sasl; ClientProtocol::EventProvider protoev; - bool abortonconnect; public: ModuleSASL() @@ -438,7 +437,6 @@ public: if (target.empty()) throw ModuleException(this, "<sasl:target> must be set to the name of your services server!"); - abortonconnect = tag->getBool("abortonconnect", true); cap.requiressl = tag->getBool("requiressl"); sasl_target = target; servertracker.Reset(); @@ -451,7 +449,7 @@ public: // in progress, the server SHOULD abort it and send a 906 numeric, then // register the client without authentication. SaslAuthenticator* saslauth = authExt.Get(user); - if (abortonconnect && saslauth) + if (saslauth && cap.GetProtocol(user) == Cap::CAP_LEGACY) { saslauth->Abort(); saslauth->AnnounceState(); |