summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 5b2c7accb..01e700885 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -101,13 +101,9 @@ class CommandStartTLS : public SplitCommand
CmdResult HandleLocal(const std::vector<std::string> &parameters, LocalUser *user)
{
- /* changed from == REG_ALL to catch clients sending STARTTLS
- * after NICK and USER but before OnUserConnect completes and
- * give a proper error message (see bug #645) - dz
- */
- if (user->registered != REG_NONE)
+ if (user->registered == REG_ALL)
{
- user->WriteNumeric(691, "%s :STARTTLS is not permitted after client registration has started", user->nick.c_str());
+ user->WriteNumeric(691, "%s :STARTTLS is not permitted after client registration is complete", user->nick.c_str());
}
else
{