Unverified Commit 52dfab65 authored by Steve Holme's avatar Steve Holme
Browse files

auth: Rename the various authentication clean up functions 

For consistency and to a avoid confusion.

Closes #3869
parent 4d8461ae

lib/curl_ntlm_wb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ 
#  define sclose_nolog(x)  close((x))

#  define sclose_nolog(x)  close((x))

#endif

#endif





void Curl_ntlm_wb_cleanup(struct connectdata *conn)

void Curl_http_auth_cleanup_ntlm_wb(struct connectdata *conn)

{

{

  if(conn->ntlm_auth_hlpr_socket != CURL_SOCKET_BAD) {

  if(conn->ntlm_auth_hlpr_socket != CURL_SOCKET_BAD) {

    sclose(conn->ntlm_auth_hlpr_socket);

    sclose(conn->ntlm_auth_hlpr_socket);
@@ -423,7 +423,7 @@ CURLcode Curl_output_ntlm_wb(struct connectdata *conn, 
    DEBUG_OUT(fprintf(stderr, "**** %s\n ", *allocuserpwd));

    DEBUG_OUT(fprintf(stderr, "**** %s\n ", *allocuserpwd));

    ntlm->state = NTLMSTATE_TYPE3; /* we sent a type-3 */

    ntlm->state = NTLMSTATE_TYPE3; /* we sent a type-3 */

    authp->done = TRUE;

    authp->done = TRUE;

    Curl_ntlm_wb_cleanup(conn);

    Curl_http_auth_cleanup_ntlm_wb(conn);

    if(!*allocuserpwd)

    if(!*allocuserpwd)

      return CURLE_OUT_OF_MEMORY;

      return CURLE_OUT_OF_MEMORY;

    break;

    break;

lib/curl_ntlm_wb.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *                             \___|\___/|_| \_\_____|

 *

 *

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 *

 * This software is licensed as described in the file COPYING, which

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * you should have received as part of this distribution. The terms
@@ -31,7 +31,7 @@ 
   to Samba's winbind daemon helper ntlm_auth */

   to Samba's winbind daemon helper ntlm_auth */

CURLcode Curl_output_ntlm_wb(struct connectdata *conn, bool proxy);

CURLcode Curl_output_ntlm_wb(struct connectdata *conn, bool proxy);





void Curl_ntlm_wb_cleanup(struct connectdata *conn);

void Curl_http_auth_cleanup_ntlm_wb(struct connectdata *conn);





#endif /* !CURL_DISABLE_HTTP && USE_NTLM && NTLM_WB_ENABLED */

#endif /* !CURL_DISABLE_HTTP && USE_NTLM && NTLM_WB_ENABLED */

lib/curl_sasl.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -83,14 +83,14 @@ void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused) 
#if defined(USE_KERBEROS5)

#if defined(USE_KERBEROS5)

  /* Cleanup the gssapi structure */

  /* Cleanup the gssapi structure */

  if(authused == SASL_MECH_GSSAPI) {

  if(authused == SASL_MECH_GSSAPI) {

    Curl_auth_gssapi_cleanup(&conn->krb5);

    Curl_auth_cleanup_gssapi(&conn->krb5);

  }

  }

#endif

#endif





#if defined(USE_NTLM)

#if defined(USE_NTLM)

  /* Cleanup the NTLM structure */

  /* Cleanup the NTLM structure */

  if(authused == SASL_MECH_NTLM) {

  if(authused == SASL_MECH_NTLM) {

    Curl_auth_ntlm_cleanup(&conn->ntlm);

    Curl_auth_cleanup_ntlm(&conn->ntlm);

  }

  }

#endif

#endif

lib/easy.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -963,7 +963,7 @@ void curl_easy_reset(struct Curl_easy *data) 
  memset(&data->state.authproxy, 0, sizeof(struct auth));

  memset(&data->state.authproxy, 0, sizeof(struct auth));





#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)

#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)

  Curl_digest_cleanup(data);

  Curl_http_auth_cleanup_digest(data);

#endif

#endif

}

}

lib/http_digest.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *                             \___|\___/|_| \_\_____|

 *

 *

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 *

 * This software is licensed as described in the file COPYING, which

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * you should have received as part of this distribution. The terms
@@ -28,6 +28,7 @@ 
#include "strcase.h"

#include "strcase.h"

#include "vauth/vauth.h"

#include "vauth/vauth.h"

#include "http_digest.h"

#include "http_digest.h"



/* The last 3 #include files should be in this order */

/* The last 3 #include files should be in this order */

#include "curl_printf.h"

#include "curl_printf.h"

#include "curl_memory.h"

#include "curl_memory.h"
@@ -171,7 +172,7 @@ CURLcode Curl_output_digest(struct connectdata *conn, 
  return CURLE_OK;

  return CURLE_OK;

}

}





void Curl_digest_cleanup(struct Curl_easy *data)

void Curl_http_auth_cleanup_digest(struct Curl_easy *data)

{

{

  Curl_auth_digest_cleanup(&data->state.digest);

  Curl_auth_digest_cleanup(&data->state.digest);

  Curl_auth_digest_cleanup(&data->state.proxydigest);

  Curl_auth_digest_cleanup(&data->state.proxydigest);