From a58654cbc5bea608b9c8729703a6d866ffaae8d8 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Thu, 2 Jul 2020 17:41:37 +0200 Subject: [PATCH 1/2] tool_getparam: make --krb option work again It was disabled by mistake in commit curl-7_37_1-23-ge38ba4301. Bug: https://bugzilla.redhat.com/1833193 Closes #5640 Upstream-commit: d2fd845c35922ca73b89c617597dd5c59772e16a Signed-off-by: Kamil Dudka --- src/tool_getparam.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 3409621..9c6bc8a 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -813,7 +813,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'x': /* --krb */ /* kerberos level string */ - if(curlinfo->features & CURL_VERSION_KERBEROS4) + if(curlinfo->features & CURL_VERSION_SPNEGO) GetStr(&config->krblevel, nextarg); else return PARAM_LIBCURL_DOESNT_SUPPORT; -- 2.21.3 From 0be44560dfe3597a12b21b95798f69714ff0459a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 2 Jul 2020 23:46:40 +0200 Subject: [PATCH 2/2] curl_version_info.3: CURL_VERSION_KERBEROS4 is deprecated This came up in #5640. It make sense to clarify this in the docs! Reminded-by: Kamil Dudka Closes #5642 Upstream-commit: 54f21be2e3a64b9e57130cf6d1eb4f17c44d7967 Signed-off-by: Kamil Dudka --- docs/libcurl/curl_version_info.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/libcurl/curl_version_info.3 b/docs/libcurl/curl_version_info.3 index 2d21dfb..0d26e87 100644 --- a/docs/libcurl/curl_version_info.3 +++ b/docs/libcurl/curl_version_info.3 @@ -151,7 +151,7 @@ letters. (Added in 7.12.0) .IP CURL_VERSION_IPV6 supports IPv6 .IP CURL_VERSION_KERBEROS4 -supports Kerberos V4 (when using FTP) +supports Kerberos V4 (when using FTP). Legacy bit. Deprecated since 7.33.0. .IP CURL_VERSION_KERBEROS5 supports Kerberos V5 authentication for FTP, IMAP, POP3, SMTP and SOCKSv5 proxy (Added in 7.40.0) -- 2.21.3