summaryrefslogtreecommitdiff
path: root/lib/curl_gethostname.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2011-09-13 22:19:47 +0100
committerDaniel Stenberg <daniel@haxx.se>2011-09-18 13:24:58 +0200
commit42be24af893c6605b15112e50f2516828ad9e24d (patch)
tree6fee4597a286cc52b45c0f052105e72bd54840a4 /lib/curl_gethostname.c
parent260b0f4d0cdb7c0ce30b16ae9a4cb94de6b36537 (diff)
downloadcurl-42be24af893c6605b15112e50f2516828ad9e24d.tar.gz
Curl_gethostname: return un-qualified machine name
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.
Diffstat (limited to 'lib/curl_gethostname.c')
-rw-r--r--lib/curl_gethostname.c43
1 files changed, 37 insertions, 6 deletions
diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c
index 7f0bfed54..210ca0264 100644
--- a/lib/curl_gethostname.c
+++ b/lib/curl_gethostname.c
@@ -28,16 +28,23 @@
#include "curl_gethostname.h"
+/* Hostname buffer size */
+#define HOSTNAME_MAX 1024
+
/*
* Curl_gethostname() is a wrapper around gethostname() which allows
* overriding the host name that the function would normally return.
* 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
* when environment variable CURL_GETHOSTNAME is set, using the value
* 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
* another shared library named libhostname using the LD_PRELOAD
* mechanism which intercepts, and might override, the gethostname()
@@ -58,24 +65,48 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen) {
return -1;
#else
+ int err = 0;
+ char* dot = NULL;
+ char hostname[HOSTNAME_MAX + 1];
#ifdef DEBUGBUILD
/* Override host name when environment variable CURL_GETHOSTNAME is set */
const char *force_hostname = getenv("CURL_GETHOSTNAME");
if(force_hostname) {
- strncpy(name, force_hostname, namelen);
- name[namelen-1] = '\0';
- return 0;
+ strncpy(hostname, force_hostname, sizeof(hostname));
+ hostname[sizeof(hostname) - 1] = '\0';
}
+ else
+ err = gethostname(hostname, sizeof(hostname));
-#endif /* DEBUGBUILD */
+#else /* DEBUGBUILD */
/* The call to system's gethostname() might get intercepted by the
libhostname library when libcurl is built as a non-debug shared
library when running the test suite. */
- return gethostname(name, namelen);
+ err = gethostname(hostname, sizeof(hostname));
+
+#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
}