From ecf32c964aa1f45285d26c91f2cad5513075aa45 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 12 Jun 2003 17:34:27 +0000 Subject: CURLHTTP* renamed to CURLAUTH* and NEGOTIATE is now GSSNEGOTIATE as there's a "plain" Negotiate as well. --- lib/url.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'lib/url.c') diff --git a/lib/url.c b/lib/url.c index f02eec0cc..397d1d452 100644 --- a/lib/url.c +++ b/lib/url.c @@ -851,36 +851,24 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...) { curl_httpauth auth = va_arg(param, long); switch(auth) { - case CURLHTTP_BASIC: - /* default */ - data->set.httpdigest = FALSE; - data->set.httpnegotiate = FALSE; - data->set.httpntlm = FALSE; + case CURLAUTH_BASIC: + case CURLAUTH_DIGEST: + data->set.httpauth = auth; break; - case CURLHTTP_DIGEST: - /* Enable HTTP Digest authentication */ - data->set.httpdigest = TRUE; - data->set.httpnegotiate = FALSE; - data->set.httpntlm = FALSE; - break; - case CURLHTTP_NTLM: + case CURLAUTH_NTLM: /* Enable HTTP NTLM authentication */ #ifdef USE_SSLEAY /* We can only support NTLM if OpenSSL is present, as we need their crypto package for it */ - data->set.httpdigest = FALSE; - data->set.httpnegotiate = FALSE; - data->set.httpntlm = TRUE; + data->set.httpauth = auth; break; #else /* fall-through */ #endif - case CURLHTTP_NEGOTIATE: + case CURLAUTH_GSSNEGOTIATE: #ifdef GSSAPI /* Enable HTTP Negotaiate authentication */ - data->set.httpdigest = FALSE; - data->set.httpnegotiate = TRUE; - data->set.httpntlm = FALSE; + data->set.httpauth = auth; break; #else /* fall-through */ -- cgit v1.2.3