From 5801ddb85cc26dea10f73246b364d8cc52557372 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Mon, 19 Sep 2011 20:55:56 +0100 Subject: [PATCH] Curl_ntlm_create_type3_message: Tidied up the use of Curl_gethostname. Removed the code that striped off the domain name when Curl_gethostname returned the fully qualified domain name as the function has been updated to return the un-qualified host name. Replaced the use of HOSTNAME_MAX as the size of the buffer in the call to Curl_gethostname with sizeof(host) as this is safer should the buffer size ever be changed. --- lib/curl_ntlm_msgs.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c index d2d34a7b3..c67fdb2cf 100644 --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c @@ -683,18 +683,13 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data, if(user) userlen = strlen(user); - if(Curl_gethostname(host, HOSTNAME_MAX)) { + /* Get the machine's un-qualified host name as NTLM doesn't like the fully + qualified domain name */ + if(Curl_gethostname(host, sizeof(host))) { infof(data, "gethostname() failed, continuing without!"); hostlen = 0; } else { - /* If the workstation if configured with a full DNS name (i.e. - * workstation.somewhere.net) gethostname() returns the fully qualified - * name, which NTLM doesn't like. - */ - char *dot = strchr(host, '.'); - if(dot) - *dot = '\0'; hostlen = strlen(host); }