From 0472cc5dd46c1877b9a8802d6ac7659fa3246c33 Mon Sep 17 00:00:00 2001 From: danieldg Date: Tue, 16 Feb 2010 21:38:38 +0000 Subject: 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 --- src/modules/extra/m_ssl_gnutls.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/modules') 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 ¶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 { -- cgit v1.2.3