diff options
| -rw-r--r-- | lib/curl_gethostname.c | 61 | ||||
| -rw-r--r-- | lib/curl_gethostname.h | 9 | ||||
| -rw-r--r-- | lib/setup.h | 12 | ||||
| -rw-r--r-- | tests/libtest/chkhostname.c | 4 | ||||
| -rw-r--r-- | tests/libtest/sethostname.c | 17 | ||||
| -rwxr-xr-x | tests/runtests.pl | 5 |
6 files changed, 69 insertions, 39 deletions
diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c index 5a8c6494b..7f0bfed54 100644 --- a/lib/curl_gethostname.c +++ b/lib/curl_gethostname.c @@ -21,32 +21,61 @@ ***************************************************************************/ #include "setup.h" + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + #include "curl_gethostname.h" -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +/* + * 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. + * + * 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. + * + * 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() + * function call. In this case a given platform must support the + * LD_PRELOAD mechanism and additionally have environment variable + * CURL_GETHOSTNAME set in order to override the returned host name. + * + * For libcurl static library release builds no overriding takes place. + */ -#define GETHOSTNAME_ENV_VAR "CURL_GETHOSTNAME" +int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen) { -int Curl_gethostname(char *name, size_t namelen) { -#ifdef HAVE_GETHOSTNAME +#ifndef HAVE_GETHOSTNAME -#ifdef CURLDEBUG - /* we check the environment variable only in case of debug build */ - const char *force_hostname = getenv(GETHOSTNAME_ENV_VAR); + /* Allow compilation and return failure when unavailable */ + (void) name; + (void) namelen; + return -1; + +#else + +#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; } -#endif - /* no override requested */ + +#endif /* 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); -#else - /* no gethostname() available on system, we should always fail */ - (void) name; - (void) namelen; - return -1; #endif + } diff --git a/lib/curl_gethostname.h b/lib/curl_gethostname.h index 0e393afe4..b8ecf88d6 100644 --- a/lib/curl_gethostname.h +++ b/lib/curl_gethostname.h @@ -22,13 +22,6 @@ * ***************************************************************************/ -#include "setup.h" - -/* wrapper around gethostname(), which makes it possible to override the - * returned value during testing. It reads the value of CURL_GETHOSTNAME - * environment variable when built with --enable-curldebug. The function always - * returns -1, if gethostname() is not available on system. - */ -int Curl_gethostname(char *name, size_t namelen); +int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen); #endif /* HEADER_CURL_GETHOSTNAME_H */ diff --git a/lib/setup.h b/lib/setup.h index 90bb898a3..e7dcba1dc 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -356,6 +356,18 @@ # endif #endif +/* + * Arg 2 type for gethostname in case it hasn't been defined in config file. + */ + +#ifndef GETHOSTNAME_TYPE_ARG2 +# ifdef USE_WINSOCK +# define GETHOSTNAME_TYPE_ARG2 int +# else +# define GETHOSTNAME_TYPE_ARG2 size_t +# endif +#endif + /* Below we define some functions. They should 4. set the SIGALRM signal timeout diff --git a/tests/libtest/chkhostname.c b/tests/libtest/chkhostname.c index 686eb471a..72c8b6a1f 100644 --- a/tests/libtest/chkhostname.c +++ b/tests/libtest/chkhostname.c @@ -1,6 +1,6 @@ -#include "curl_gethostname.h" +#include "setup.h" -#include <stdio.h> +#include "curl_gethostname.h" #define HOSTNAME_MAX 1024 diff --git a/tests/libtest/sethostname.c b/tests/libtest/sethostname.c index d050f18d6..9d9fae00b 100644 --- a/tests/libtest/sethostname.c +++ b/tests/libtest/sethostname.c @@ -7,25 +7,20 @@ * */ -#include <stdlib.h> -#include <string.h> - -#define GETHOSTNAME_ENV_VAR "CURL_GETHOSTNAME" +#include "setup.h" /* * we force our own host name, in order to make some tests machine independent - * - * Since some systems think this prototype doesn't match the system provided - * function, we AVOID including unistd.h or other headers that may include the - * original prototype! We provide our own instead (to avoid warnings). */ -int gethostname(char *name, size_t namelen); -int gethostname(char *name, size_t namelen) +int gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen); + +int gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen) { - const char *force_hostname = getenv(GETHOSTNAME_ENV_VAR); + const char *force_hostname = getenv("CURL_GETHOSTNAME"); if(force_hostname) { strncpy(name, force_hostname, namelen); + name[namelen-1] = '\0'; return 0; } diff --git a/tests/runtests.pl b/tests/runtests.pl index 8bb5d69e9..a97d8647e 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2376,8 +2376,9 @@ sub singletest { delete $ENV{$var} if($ENV{$var}); } else { - if(($has_shared ne "yes") && ($var =~ /^LD_PRELOAD/)) { - # print "Skipping LD_PRELOAD due to no shared build\n"; + if(($var =~ /^LD_PRELOAD/) && + ($debug_build || ($has_shared ne "yes"))) { + # print "Skipping LD_PRELOAD due to no release shared build\n"; next; } $ENV{$var} = "$content"; |