diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-11-14 21:16:08 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-11-14 22:11:48 +0000 |
| commit | 18e53fa91ac56ca55c1dcbc5bbff8e1157304623 (patch) | |
| tree | c26fc5ce6fc284d581f4b613d43593d13c611e6d | |
| parent | 8c58dea8997e5d9133a006d11f9c5d97a2c5c2f5 (diff) | |
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.
| -rw-r--r-- | lib/curl_sasl.c | 4 | ||||
| -rw-r--r-- | lib/curl_sasl.h | 3 | ||||
| -rw-r--r-- | lib/curl_sasl_sspi.c | 14 |
3 files changed, 13 insertions, 8 deletions
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index 44efd9149..3600fa2fe 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -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) diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h index 74f446500..26d94296c 100644 --- a/lib/curl_sasl.h +++ b/lib/curl_sasl.h @@ -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 diff --git a/lib/curl_sasl_sspi.c b/lib/curl_sasl_sspi.c index ffc569c09..b07623fb9 100644 --- a/lib/curl_sasl_sspi.c +++ b/lib/curl_sasl_sspi.c @@ -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 */ |