diff options
| author | George Hazan <ghazan@miranda.im> | 2017-12-22 22:07:15 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-12-22 22:07:15 +0300 |
| commit | 480f2c3624748ddbc551cb533c081786904712cb (patch) | |
| tree | d431d2d49d98f56c3f1ee01a98cca0778a2feb8e /protocols/IRCG/src/irclib.cpp | |
| parent | 37996933cb4dd497c9a7cd7aa794eba62dee2142 (diff) | |
quick-n-dirty fix for #1069
Diffstat (limited to 'protocols/IRCG/src/irclib.cpp')
| -rw-r--r-- | protocols/IRCG/src/irclib.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp index 94f736affa..0033ec2d6c 100644 --- a/protocols/IRCG/src/irclib.cpp +++ b/protocols/IRCG/src/irclib.cpp @@ -224,11 +224,12 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info) m_info = info; + if (m_bUseSASL) + NLSend("CAP REQ :sasl\r\n"); + // start receiving messages from host ForkThread(&CIrcProto::ThreadProc, nullptr); Sleep(100); - if (info.sPassword.GetLength()) - NLSend("PASS %s\r\n", info.sPassword.c_str()); NLSend(L"NICK %s\r\n", info.sNick.c_str()); CMStringW userID = GetWord(info.sUserID.c_str(), 0); @@ -242,6 +243,9 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info) HostName = L"host"; NLSend(L"USER %s %s %s :%s\r\n", userID.c_str(), HostName.c_str(), L"server", info.sFullName.c_str()); + if (!m_bUseSASL && info.sPassword.GetLength()) + NLSend("PASS %s\r\n", info.sPassword.c_str()); + return con != nullptr; } |