diff options
| author | Dan Winship <danw@gnome.org> | 2013-04-10 09:11:45 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-04-10 09:12:29 -0400 |
| commit | 727cae4b26d528887e8cc0e7fd503df5b78bc3ac (patch) | |
| tree | d2aa3ffb298531f15afc8b448640b851a8208d71 | |
| parent | df03c80e44ff2efe15dcca40b214fb2050fbe6e2 (diff) | |
| download | libsoup-727cae4b26d528887e8cc0e7fd503df5b78bc3ac.tar.gz libsoup-727cae4b26d528887e8cc0e7fd503df5b78bc3ac.tar.bz2 libsoup-727cae4b26d528887e8cc0e7fd503df5b78bc3ac.zip | |
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
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/ntlm-test.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 80b96498..983bf501 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 3588c555..f67a3d14 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); |