diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 17:34:01 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 17:34:01 +0000 |
| commit | 9c210d96fb1f28dd523275b0db34908d2359b76f (patch) | |
| tree | 616436357c48cf2d7382a57f90234701f416ce49 /net/http/http_auth_unittest.cc | |
| parent | e6ce5e42370454686624b65c5db6af91da6c42bf (diff) | |
| download | chromium_src-9c210d96fb1f28dd523275b0db34908d2359b76f.zip chromium_src-9c210d96fb1f28dd523275b0db34908d2359b76f.tar.gz chromium_src-9c210d96fb1f28dd523275b0db34908d2359b76f.tar.bz2 | |
Linux: control usage of Kerberos via use_kerberos gyp flag
(on by default)
This allows Linux distro packagers to control usage of Kerberos
explicitly instead of relying on auto-detection.
BUG=92689
Review URL: http://codereview.chromium.org/7633006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_auth_unittest.cc')
| -rw-r--r-- | net/http/http_auth_unittest.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/http/http_auth_unittest.cc b/net/http/http_auth_unittest.cc index fe11c03..e70cb0d 100644 --- a/net/http/http_auth_unittest.cc +++ b/net/http/http_auth_unittest.cc @@ -103,14 +103,19 @@ TEST(HttpAuthTest, ChooseBestChallenge) { "", }, { + "WWW-Authenticate: Negotiate\n" + "WWW-Authenticate: NTLM\n", + +#if defined(USE_KERBEROS) // Choose Negotiate over NTLM on all platforms. // TODO(ahendrickson): This may be flaky on Linux and OSX as it // relies on being able to load one of the known .so files // for gssapi. - "WWW-Authenticate: Negotiate\n" - "WWW-Authenticate: NTLM\n", - HttpAuth::AUTH_SCHEME_NEGOTIATE, +#else + // On systems that don't use Kerberos fall back to NTLM. + HttpAuth::AUTH_SCHEME_NTLM, +#endif // defined(USE_KERBEROS) "", } }; |