Bug #645 was correct behavior on the client's part, the IRC STARTTLS standard was...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12480 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 5b2c7accbef069057d26eced9e9f2e20d640f1ef..01e7008851c8c97e74d929592cccd4befa54df4b 100644 (file)
--- 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
                {