From 39d68b47e19c9dc42d578a923cb842f061eac165 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Fri, 8 Apr 2016 18:41:41 +0100 Subject: http_negotiate: Calculate service name and proxy service name locally Calculate the service name and proxy service names locally, rather than in url.c which will allow for us to support overriding the service name for other protocols such as FTP, IMAP, POP3 and SMTP. --- lib/url.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'lib/url.c') diff --git a/lib/url.c b/lib/url.c index d20c36928..5705252c4 100644 --- a/lib/url.c +++ b/lib/url.c @@ -576,18 +576,6 @@ CURLcode Curl_init_userdefined(struct UserDefined *set) CURL_DEFAULT_SOCKS5_GSSAPI_SERVICE); if(result) return result; - - /* set default negotiate proxy service name */ - result = setstropt(&set->str[STRING_PROXY_SERVICE_NAME], - CURL_DEFAULT_PROXY_SERVICE_NAME); - if(result) - return result; - - /* set default negotiate service name */ - result = setstropt(&set->str[STRING_SERVICE_NAME], - CURL_DEFAULT_SERVICE_NAME); - if(result) - return result; #endif /* This is our preferred CA cert bundle/path since install time */ -- cgit v1.2.3