Skip to content

Commit

Permalink
configure: Fixed inclusion of krb5 when CURL_DISABLE_CRYPTO_AUTH is d…
Browse files Browse the repository at this point in the history
…efined

Commit fe0f896 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.
  • Loading branch information
captain-caveman2k committed Nov 11, 2014
1 parent f64dbb0 commit 676d62f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Expand Up @@ -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 \
Expand All @@ -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

Expand Down

0 comments on commit 676d62f

Please sign in to comment.