diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-02-16 21:38:38 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2010-02-16 21:38:38 +0000 |
| commit | 0472cc5dd46c1877b9a8802d6ac7659fa3246c33 (patch) | |
| tree | b0b8fdea8537acc70b12bb3ecfdc63b0ba0b0f55 | |
| parent | 024490be0b850cf621ec60a7df48688df0942d99 (diff) | |
Bug #645 was correct behavior on the client's part, the IRC STARTTLS standard was broken
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12480 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 8 |
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> ¶meters, 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 { |