[gnurl] 65/151: http_ntlm: Remove duplicate NSS initialisation

[gnunet]

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.