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.
This commit is contained in:
parent
38b5744266
commit
5801ddb85c
@ -683,18 +683,13 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data,
|
|||||||
if(user)
|
if(user)
|
||||||
userlen = strlen(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!");
|
infof(data, "gethostname() failed, continuing without!");
|
||||||
hostlen = 0;
|
hostlen = 0;
|
||||||
}
|
}
|
||||||
else {
|
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);
|
hostlen = strlen(host);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user