diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-11-11 00:04:05 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-11-11 00:14:33 +0000 |
| commit | 676d62fa0ede12e8f66688675d9db3bb7103cd55 (patch) | |
| tree | 5cc9f4b50415dd7b5f745b88fb8cdee12eaeb6e3 | |
| parent | f64dbb08c2cd6bcf4f39ca2e75edbfc8cc3116e1 (diff) | |
configure: Fixed inclusion of krb5 when CURL_DISABLE_CRYPTO_AUTH is defined
Commit fe0f8967bf fixed a problem with krb5 not being defined as a
supported feature when HAVE_GSSAPI is defined, however, it should
only be included if CURL_DISABLE_CRYPTO_AUTH is not set, like when
SPNEGO is listed as a feature.
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1f801adcc..64887ef21 100644 --- a/configure.ac +++ b/configure.ac @@ -3354,7 +3354,7 @@ if test "x$USE_WINDOWS_SSPI" = "x1"; then fi if test "x$HAVE_GSSAPI" = "x1"; then - SUPPORT_FEATURES="$SUPPORT_FEATURES GSS-API krb5" + SUPPORT_FEATURES="$SUPPORT_FEATURES GSS-API" fi if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \ @@ -3363,7 +3363,7 @@ if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \ fi if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \ - \( "x$USE_WINDOWS_SSPI" = "x1" \); then + \( "x$HAVE_GSSAPI" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \); then SUPPORT_FEATURES="$SUPPORT_FEATURES krb5" fi |