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

sasl: Fixed compilation errors from commit 9d89a038 

...when GSS-API or Windows SSPI are not used.
parent 43116218

lib/curl_sasl.c

+5 −1
Original line number Diff line number Diff line
@@ -265,9 +265,11 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
  size_t len = 0;

  saslstate state1 = SASL_STOP;

  saslstate state2 = SASL_FINAL;

#if defined(USE_KERBEROS5)

  const char* service = data->set.str[STRING_SERVICE_NAME] ?

                        data->set.str[STRING_SERVICE_NAME] :

                        sasl->params->service;

#endif



  sasl->force_ir = force_ir;    /* Latch for future use */

  sasl->authused = 0;           /* No mechanism used yet */
@@ -412,10 +414,12 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
  char *chlg = NULL;

  size_t chlglen = 0;

#endif

  size_t len = 0;

#if !defined(CURL_DISABLE_CRYPTO_AUTH) || defined(USE_KERBEROS5)

  const char *service = data->set.str[STRING_SERVICE_NAME] ?

                        data->set.str[STRING_SERVICE_NAME] :

                        sasl->params->service;

#endif

  size_t len = 0;



  *progress = SASL_INPROGRESS;

lib/url.c

+3 −0
Original line number Diff line number Diff line
@@ -1498,7 +1498,10 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
     */

    data->set.socks5_gssapi_nec = (0 != va_arg(param, long))?TRUE:FALSE;

    break;

#endif



#if !defined(CURL_DISABLE_CRYPTO_AUTH) || defined(USE_KERBEROS5) || \

    defined(USE_SPNEGO)

  case CURLOPT_SERVICE_NAME:

    /*

     * Set authentication service name for DIGEST-MD5, Kerberos 5 and SPNEGO

lib/urldata.h

+3 −0
Original line number Diff line number Diff line
@@ -1409,6 +1409,9 @@ enum dupstring { 
#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)

  STRING_SOCKS5_GSSAPI_SERVICE, /* GSSAPI service name */

  STRING_PROXY_SERVICE_NAME, /* Proxy service name */

#endif

#if !defined(CURL_DISABLE_CRYPTO_AUTH) || defined(USE_KERBEROS5) || \

    defined(USE_SPNEGO)

  STRING_SERVICE_NAME,    /* Service name */

#endif

  STRING_MAIL_FROM,