sasl: Fixed compilation errors from commit 9d89a0387

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

diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 08beda2b930f82f8ad9fc718dc59fbed5bbbfd44..81b023523c2c0e5cabec4706b68b0456761511f1 100644 (file)
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -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;
 

diff --git a/lib/url.c b/lib/url.c
index 3439e292a993e0c2ac2b3bbdaf21f02b05ba6c58..f31d027eb9b9a0905b0e95ebd58094e0205ebf9b 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -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

diff --git a/lib/urldata.h b/lib/urldata.h
index 5f26054fc7a40aaa40c19c02792de5ca87e5db2b..c7af8c0376dc5cc49182b0c21b1afeecf9012fcf 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -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,