[libsoup] tests: fix ntlm-test when built without ntlm_auth support
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] tests: fix ntlm-test when built without ntlm_auth support
- Date: Wed, 10 Apr 2013 13:12:38 +0000 (UTC)
commit 727cae4b26d528887e8cc0e7fd503df5b78bc3ac
Author: Dan Winship <danw gnome org>
Date: Wed Apr 10 09:11:45 2013 -0400
tests: fix ntlm-test when built without ntlm_auth support
Don't try to use external NTLM auth if built without support for that.
https://bugzilla.gnome.org/show_bug.cgi?id=697510
configure.ac | 2 ++
tests/ntlm-test.c | 4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 80b9649..983bf50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,8 @@ if test "$ntlm_auth" != "no"; then
dnl --with-ntlm-auth (without path) used, use default path
ntlm_auth="/usr/bin/ntlm_auth"
fi
+else
+ MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES ntlm_auth"
fi
AC_SUBST(ntlm_auth)
AC_DEFINE_UNQUOTED(NTLM_AUTH, "$ntlm_auth", [Samba's 'winbind' daemon helper 'ntlm_auth' which can be used
for NTLM single-sign-on])
diff --git a/tests/ntlm-test.c b/tests/ntlm-test.c
index 3588c55..f67a3d1 100644
--- a/tests/ntlm-test.c
+++ b/tests/ntlm-test.c
@@ -571,8 +571,9 @@ main (int argc, char **argv)
debug_printf (1, "Built-in NTLM support\n");
do_ntlm_tests (uri, TRUE);
+#ifdef USE_NTLM_AUTH
/* Samba winbind /usr/bin/ntlm_auth helper support (via a
- * helper program that emulate's its interface).
+ * helper program that emulates its interface).
*/
g_setenv ("SOUP_NTLM_AUTH_DEBUG", BUILDDIR "/ntlm-test-helper", TRUE);
debug_printf (1, "\nExternal helper support\n");
@@ -585,6 +586,7 @@ main (int argc, char **argv)
g_setenv ("SOUP_NTLM_AUTH_DEBUG_NOCREDS", "1", TRUE);
debug_printf (1, "\nExternal -> fallback support\n");
do_ntlm_tests (uri, TRUE);
+#endif
/* Other tests */
g_setenv ("SOUP_NTLM_AUTH_DEBUG", "", TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]