summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-02-15 15:34:09 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-20 16:27:31 (GMT)
commit88f65a336248df6d2ba07e2bac24f0f4e8c1815b (patch)
tree579d91e919bb38a3983bd5b510bf2f57fb34c5b0 /src/network/kernel
parent5641d4539e60a09e8b85e82605f902d78bbdeae9 (diff)
downloadQt-88f65a336248df6d2ba07e2bac24f0f4e8c1815b.zip
Qt-88f65a336248df6d2ba07e2bac24f0f4e8c1815b.tar.gz
Qt-88f65a336248df6d2ba07e2bac24f0f4e8c1815b.tar.bz2
Update documentation to show NTLMv2 is supported
This feature was implemented in 4.8, but documentation was not updated at the time. Task-number: QTBUG-18181 Change-Id: I657d7ab7aaf43b73b7bf8fd1cb76086522cf5c2b (cherry picked from commit 6f7bd6532d34713811c8f70b287d151d24cdda7c) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/kernel')
-rw-r--r--src/network/kernel/qauthenticator.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index f4850b2..790e40a 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -82,12 +82,10 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
QAuthenticator supports the following authentication methods:
\list
\o Basic
- \o NTLM version 1
+ \o NTLM version 2
\o Digest-MD5
\endlist
- Note that, in particular, NTLM version 2 is not supported.
-
\section1 Options
In addition to the username and password required for authentication, a
@@ -113,7 +111,7 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
The Basic authentication mechanism supports no outgoing options.
- \section2 NTLM version 1
+ \section2 NTLM version 2
The NTLM authentication mechanism currently supports no incoming or outgoing options.