Commit 18e53fa9 authored by Steve Holme's avatar Steve Holme
Browse files

sasl: Moved Curl_sasl_gssapi_cleanup() definition into header file 

Rather than define the function as extern in the source files that use
it, moved the function declaration into the SASL header file just like
the Digest and NTLM clean-up functions.

Additionally, added a function description comment block.
parent 8c58dea8

lib/curl_sasl.c

+0 −4
Original line number Diff line number Diff line
@@ -55,10 +55,6 @@ 
/* The last #include file should be: */

#include "memdebug.h"



#if defined(USE_KRB5)

extern void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5);

#endif



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

#define DIGEST_QOP_VALUE_AUTH             (1 << 0)

#define DIGEST_QOP_VALUE_AUTH_INT         (1 << 1)

lib/curl_sasl.h

+3 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ CURLcode Curl_sasl_create_gssapi_security_message(struct SessionHandle *data, 
                                                  struct kerberos5data *krb5,

                                                  char **outptr,

                                                  size_t *outlen);



/* This is used to clean up the gssapi specific data */

void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5);

#endif /* USE_KRB5 */



/* This is used to generate a base64 encoded XOAUTH2 authentication message

lib/curl_sasl_sspi.c

+10 −4
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ 
/* The last #include file should be: */

#include "memdebug.h"



#if defined(USE_KRB5)

void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5);

#endif



/*

 * Curl_sasl_build_spn()

 *
@@ -1010,6 +1006,16 @@ CURLcode Curl_sasl_create_gssapi_security_message(struct SessionHandle *data, 
  return result;

}



/*

* Curl_sasl_gssapi_cleanup()

*

* This is used to clean up the gssapi specific data.

*

* Parameters:

*

* krb5     [in/out] - The kerberos 5 data struct being cleaned up.

*

*/

void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5)

{

  /* Free our security context */