Commit b8504379 authored by Steve Holme's avatar Steve Holme
Browse files

sasl: Updated SPN variables and comments for consistency 

In places the "host name" and "realm" variable was referred to as
"instance" whilst in others it was referred to as "host".
parent eb8283bb

lib/curl_sasl.c

+4 −4
Original line number Diff line number Diff line
@@ -263,19 +263,19 @@ static CURLcode sasl_digest_get_qop_values(const char *options, int *value) 
/*

 * Curl_sasl_build_spn()

 *

 * This is used to build a SPN string in the format service/host.

 * This is used to build a SPN string in the format service/instance.

 *

 * Parameters:

 *

 * service  [in] - The service type such as www, smtp, pop or imap.

 * host     [in] - The host name or realm.

 * instance [in] - The host name or realm.

 *

 * Returns a pointer to the newly allocated SPN.

 */

char *Curl_sasl_build_spn(const char *service, const char *host)

char *Curl_sasl_build_spn(const char *service, const char *instance)

{

  /* Generate and return our SPN */

  return aprintf("%s/%s", service, host);

  return aprintf("%s/%s", service, instance);

}

#endif

lib/curl_sasl.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ int Curl_sasl_digest_get_pair(const char *str, char *value, char *content, 
                              const char **endptr);



#if defined(HAVE_GSSAPI)

char *Curl_sasl_build_gssapi_spn(const char *service, const char *host);

char *Curl_sasl_build_gssapi_spn(const char *service, const char *instance);

#endif



#ifndef CURL_DISABLE_CRYPTO_AUTH

lib/curl_sasl_gssapi.c

+5 −5
Original line number Diff line number Diff line
@@ -43,19 +43,19 @@ 
/*

* Curl_sasl_build_gssapi_spn()

*

* This is used to build a SPN string in the format service@host.

* This is used to build a SPN string in the format service@instance.

*

* Parameters:

*

* serivce  [in] - The service type such as www, smtp, pop or imap.

* host     [in] - The host name or realm.

* service  [in] - The service type such as www, smtp, pop or imap.

* instance [in] - The host name or realm.

*

* Returns a pointer to the newly allocated SPN.

*/

char *Curl_sasl_build_gssapi_spn(const char *service, const char *host)

char *Curl_sasl_build_gssapi_spn(const char *service, const char *instance)

{

  /* Generate and return our SPN */

  return aprintf("%s@%s", service, host);

  return aprintf("%s@%s", service, instance);

}



/*

lib/curl_sasl_sspi.c

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *                             \___|\___/|_| \_\_____|

 *

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

 * Copyright (C) 2014, Steve Holme, <steve_holme@hotmail.com>.

 * Copyright (C) 2014 - 2015, Steve Holme, <steve_holme@hotmail.com>.

 *

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

 * you should have received as part of this distribution. The terms
@@ -49,16 +49,16 @@ 
/*

 * Curl_sasl_build_spn()

 *

 * This is used to build a SPN string in the format service/host.

 * This is used to build a SPN string in the format service/instance.

 *

 * Parameters:

 *

 * serivce  [in] - The service type such as www, smtp, pop or imap.

 * host     [in] - The host name or realm.

 * instance [in] - The host name or realm.

 *

 * Returns a pointer to the newly allocated SPN.

 */

TCHAR *Curl_sasl_build_spn(const char *service, const char *host)

TCHAR *Curl_sasl_build_spn(const char *service, const char *instance)

{

  char *utf8_spn = NULL;

  TCHAR *tchar_spn = NULL;
@@ -71,7 +71,7 @@ TCHAR *Curl_sasl_build_spn(const char *service, const char *host) 
     formulate the SPN instead. */



  /* Allocate our UTF8 based SPN */

  utf8_spn = aprintf("%s/%s", service, host);

  utf8_spn = aprintf("%s/%s", service, instance);

  if(!utf8_spn) {

    return NULL;

  }