aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2011-07-31 20:44:41 +0200
committerYang Tse <yangsita@gmail.com>2011-07-31 20:44:41 +0200
commit10a0bed48536e5a3fe801a5e0d94bd84ad80c559 (patch)
tree931c4a697c2aaf437067ca38914c57c1aa5c32f0 /tests
parentcc3e01cfae461c69c240f21a7b10fb31e1314fb7 (diff)
NTLM single-sign on adjustments (VIII)
Use preprocessor symbols WINBIND_NTLM_AUTH_ENABLED and WINBIND_NTLM_AUTH_FILE for Samba's winbind daemon ntlm_auth helper code implementation and filename. Retain preprocessor symbol USE_NTLM_SSO for NTLM single-sign-on feature availability implementation independent. For test harness, prefix NTLM_AUTH environment vars with CURL_ Refactor and rename configure option --with-ntlm-auth to --enable-wb-ntlm-auth[=FILE]
Diffstat (limited to 'tests')
-rw-r--r--tests/data/test13106
-rw-r--r--tests/server/fake_ntlm.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/data/test1310 b/tests/data/test1310
index e101fd71f..9187acfe3 100644
--- a/tests/data/test1310
+++ b/tests/data/test1310
@@ -70,11 +70,11 @@ CURL_GETHOSTNAME=curlhost
# we try to use the LD_PRELOAD hack, if not a debug build
LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
# set path to fake_auth instead of real ntlm_auth to generate NTLM type1 and type 3 messages
-NTLM_AUTH=%PWD/server/fake_ntlm
+CURL_NTLM_AUTH=%PWD/server/fake_ntlm
# set source directory so fake_ntlm can find the test files
-NTLM_AUTH_SRCDIR=%SRCDIR
+CURL_NTLM_AUTH_SRCDIR=%SRCDIR
# set the test number
-NTLM_AUTH_TESTNUM=1310
+CURL_NTLM_AUTH_TESTNUM=1310
</setenv>
<command>
http://%HOSTIP:%HTTPPORT/1310 -u testuser:anypasswd --ntlm-sso
diff --git a/tests/server/fake_ntlm.c b/tests/server/fake_ntlm.c
index c0aa1e048..e97cef9af 100644
--- a/tests/server/fake_ntlm.c
+++ b/tests/server/fake_ntlm.c
@@ -168,21 +168,21 @@ int main(int argc, char *argv[])
helper_user, helper_proto, helper_domain,
(use_cached_creds == TRUE) ? "yes" : "no");
- env = getenv("NTLM_AUTH_TESTNUM");
+ env = getenv("CURL_NTLM_AUTH_TESTNUM");
if (env) {
char *endptr;
long lnum = strtol(env, &endptr, 10);
if((endptr != env + strlen(env)) || (lnum < 1L)) {
- logmsg("Test number not valid in NTLM_AUTH_TESTNUM");
+ logmsg("Test number not valid in CURL_NTLM_AUTH_TESTNUM");
exit(1);
}
testnum = lnum;
} else {
- logmsg("Test number not specified in NTLM_AUTH_TESTNUM");
+ logmsg("Test number not specified in CURL_NTLM_AUTH_TESTNUM");
exit(1);
}
- env = getenv("NTLM_AUTH_SRCDIR");
+ env = getenv("CURL_NTLM_AUTH_SRCDIR");
if (env) {
path = env;
}