[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 65/151: http_ntlm: Remove duplicate NSS initialisation
From: |
gnunet |
Subject: |
[gnurl] 65/151: http_ntlm: Remove duplicate NSS initialisation |
Date: |
Fri, 20 Dec 2019 14:26:14 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit bb8cf0516953eea24cdedee47d31db77e8ced0dc
Author: Steve Holme <address@hidden>
AuthorDate: Wed May 8 14:40:16 2019 +0100
http_ntlm: Remove duplicate NSS initialisation
Given that this is performed by the NTLM code there is no need to
perform the initialisation in the HTTP layer. This also keeps the
initialisation the same as the SASL based protocols and also fixes a
possible compilation issue if both NSS and SSPI were to be used as
multiple SSL backends.
Reviewed-by: Kamil Dudka
Closes #3935
---
lib/http_ntlm.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index e4a4fe05d..342b2424f 100644
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -44,9 +44,7 @@
/* SSL backend-specific #if branches in this file must be kept in the order
documented in curl_ntlm_core. */
-#if defined(NTLM_NEEDS_NSS_INIT)
-#include "vtls/nssg.h"
-#elif defined(USE_WINDOWS_SSPI)
+#if defined(USE_WINDOWS_SSPI)
#include "curl_sspi.h"
#endif
@@ -137,11 +135,6 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, bool
proxy)
DEBUGASSERT(conn);
DEBUGASSERT(conn->data);
-#if defined(NTLM_NEEDS_NSS_INIT)
- if(CURLE_OK != Curl_nss_force_init(conn->data))
- return CURLE_OUT_OF_MEMORY;
-#endif
-
if(proxy) {
allocuserpwd = &conn->allocptr.proxyuserpwd;
userp = conn->http_proxy.user;
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 42/151: include: make CURLE_HTTP3 use a new error code, (continued)
- [gnurl] 42/151: include: make CURLE_HTTP3 use a new error code, gnunet, 2019/12/20
- [gnurl] 39/151: docs: fix typos, gnunet, 2019/12/20
- [gnurl] 30/151: INSTALL.md: provide Android build instructions, gnunet, 2019/12/20
- [gnurl] 43/151: test1175: verify symbols-in-versions and libcurl-errors.3 in sync, gnunet, 2019/12/20
- [gnurl] 41/151: bump: next release will be 7.68.0, gnunet, 2019/12/20
- [gnurl] 35/151: altsvc: bump to h3-24, gnunet, 2019/12/20
- [gnurl] 36/151: ngtcp2: use overflow buffer for extra HTTP/3 data, gnunet, 2019/12/20
- [gnurl] 31/151: lib: Move lib/ssh.h -> lib/vssh/ssh.h, gnunet, 2019/12/20
- [gnurl] 46/151: RELEASE-NOTES: synced, gnunet, 2019/12/20
- [gnurl] 49/151: schannel: fix --tls-max for when min is --tlsv1 or default, gnunet, 2019/12/20
- [gnurl] 65/151: http_ntlm: Remove duplicate NSS initialisation,
gnunet <=
- [gnurl] 54/151: curl: fix --upload-file . hangs if delay in STDIN, gnunet, 2019/12/20
- [gnurl] 47/151: projects: Fix Visual Studio projects SSH builds, gnunet, 2019/12/20
- [gnurl] 56/151: travis: export the CC/CXX variables when set, gnunet, 2019/12/20
- [gnurl] 57/151: ngtcp2: fix thread-safety bug in error-handling, gnunet, 2019/12/20
- [gnurl] 60/151: mailmap: Niall O'Reilly's name, gnunet, 2019/12/20
- [gnurl] 61/151: docs: fix typos, gnunet, 2019/12/20
- [gnurl] 38/151: projects: Fix Visual Studio wolfSSL configurations, gnunet, 2019/12/20
- [gnurl] 53/151: XFERINFOFUNCTION: support CURL_PROGRESSFUNC_CONTINUE, gnunet, 2019/12/20
- [gnurl] 66/151: curl_setup_once: consistently use WHILE_FALSE in macros, gnunet, 2019/12/20
- [gnurl] 48/151: checksrc.bat: Add a check for vquic and vssh directories, gnunet, 2019/12/20