moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Curl_gethostname: return un-qualified machine name

Browse Source 
Fixed Curl_gethostname() so that it always returns the un-qualified
machine name rather than being dependent on the socket provider.

Note: The return of getenv("CURL_GETHOSTNAME") is also parsed in case
the developer / test harness provided a fully qualified domain name as
it's value as well.
This commit is contained in:
Steve Holme 2011-09-13 22:19:47 +01:00 committed by Daniel Stenberg
parent 260b0f4d0c
commit 42be24af89
1 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/curl_gethostname.c
View File

@ -28,16 +28,23 @@
#include "curl_gethostname.h" #include "curl_gethostname.h"
/* Hostname buffer size */
#define HOSTNAME_MAX 1024
/* /*
* Curl_gethostname() is a wrapper around gethostname() which allows * Curl_gethostname() is a wrapper around gethostname() which allows
* overriding the host name that the function would normally return. * overriding the host name that the function would normally return.
* This capability is used by the test suite to verify exact matching * This capability is used by the test suite to verify exact matching
* of NTLM authentication, which exercises libcurl's MD4 and DES code. * of NTLM authentication, which exercises libcurl's MD4 and DES code
* as well as by the SMTP module when a hostname is not provided.
* *
* For libcurl debug enabled builds host name overriding takes place * For libcurl debug enabled builds host name overriding takes place
* when environment variable CURL_GETHOSTNAME is set, using the value * when environment variable CURL_GETHOSTNAME is set, using the value
* held by the variable to override returned host name. * held by the variable to override returned host name.
* *
* Note: The function always returns the un-qualified hostname rather
* than being provider dependent.
*
* For libcurl shared library release builds the test suite preloads * For libcurl shared library release builds the test suite preloads
* another shared library named libhostname using the LD_PRELOAD * another shared library named libhostname using the LD_PRELOAD
* mechanism which intercepts, and might override, the gethostname() * mechanism which intercepts, and might override, the gethostname()
@ -58,24 +65,48 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen) {
return -1; return -1;
#else #else
int err = 0;
char* dot = NULL;
char hostname[HOSTNAME_MAX + 1];
#ifdef DEBUGBUILD #ifdef DEBUGBUILD
/* Override host name when environment variable CURL_GETHOSTNAME is set */ /* Override host name when environment variable CURL_GETHOSTNAME is set */
const char *force_hostname = getenv("CURL_GETHOSTNAME"); const char *force_hostname = getenv("CURL_GETHOSTNAME");
if(force_hostname) { if(force_hostname) {
strncpy(name, force_hostname, namelen); strncpy(hostname, force_hostname, sizeof(hostname));
name[namelen-1] = '\0'; hostname[sizeof(hostname) - 1] = '\0';
return 0;
} }
else
err = gethostname(hostname, sizeof(hostname));
#endif /* DEBUGBUILD */ #else /* DEBUGBUILD */
/* The call to system's gethostname() might get intercepted by the /* The call to system's gethostname() might get intercepted by the
libhostname library when libcurl is built as a non-debug shared libhostname library when libcurl is built as a non-debug shared
library when running the test suite. */ library when running the test suite. */
return gethostname(name, namelen); err = gethostname(hostname, sizeof(hostname));
#endif #endif
if(err != 0)
return err;
/* Is the hostname fully qualified? */
dot = strchr(hostname, '.');
if(dot) {
/* Copy only the machine name to the specified buffer */
size_t size = dot - hostname;
strncpy(name, hostname, namelen > size ? size : namelen);
name[(namelen > size ? size : namelen) - 1] = '\0';
}
else {
/* Copy the hostname to the specified buffer */
strncpy(name, hostname, namelen);
name[namelen - 1] = '\0';
}
return 0;
#endif
} }