0855f30709
Viktor Szakats
2025-10-10
Subject
kerberos: bump minimum to 1.3 (2003-07-08), drop legacy logic
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/scripts/cmp-config.pl +1 -0CMakeLists.txt +0 -5configure.ac +2 -9docs/INTERNALS.md +1 -1lib/curl_config.h.cmake +0 -3lib/urldata.h +1 -3lib/vauth/vauth.h +1 -3
.github/scripts/cmp-config.pl+1 -0
| @@ -46,6 +46,7 @@ my %remove = ( | |
| '#define HAVE_BROTLI_DECODE_H 1' => 1, | |
| '#define HAVE_DLFCN_H 1' => 1, | |
| '#define HAVE_GSSAPI_GSSAPI_GENERIC_H 1' => 1, | |
| + | '#define HAVE_GSSAPI_GSSAPI_H 1' => 1, |
| '#define HAVE_GSSAPI_GSSAPI_KRB5_H 1' => 1, | |
| '#define HAVE_INTTYPES_H 1' => 1, | |
| '#define HAVE_LDAP_H 1' => 1, | |
CMakeLists.txt+0 -5
| @@ -1442,11 +1442,6 @@ if(CURL_USE_GSSAPI) | |
| if(GSS_FLAVOUR STREQUAL "GNU") | |
| set(HAVE_GSSGNU 1) | |
| - | else() # MIT |
| - | cmake_push_check_state() |
| - | list(APPEND CMAKE_REQUIRED_INCLUDES "${GSS_INCLUDE_DIRS}") |
| - | check_include_file("gssapi/gssapi.h" HAVE_GSSAPI_GSSAPI_H) |
| - | cmake_pop_check_state() |
| endif() | |
| else() | |
| message(WARNING "GSSAPI has been requested, but no supporting libraries found. Skipping.") | |
configure.ac+2 -9
| @@ -1841,17 +1841,10 @@ if test x"$want_gss" = xyes; then | |
| ], | |
| [ | |
| dnl not found, check for MIT | |
| - | AC_CHECK_HEADERS([gssapi/gssapi.h], [], [not_mit=1]) |
| AC_CHECK_HEADERS( | |
| - | [gssapi/gssapi_generic.h gssapi/gssapi_krb5.h], |
| + | [gssapi/gssapi.h gssapi/gssapi_generic.h gssapi/gssapi_krb5.h], |
| [], | |
| - | [not_mit=1], |
| - | [ |
| - | AC_INCLUDES_DEFAULT |
| - | #ifdef HAVE_GSSAPI_GSSAPI_H |
| - | #include <gssapi/gssapi.h> |
| - | #endif |
| - | ]) |
| + | [not_mit=1]) |
| if test "x$not_mit" = "x1"; then | |
| dnl MIT not found | |
| AC_MSG_ERROR([MIT or GNU GSS library required, but not found]) | |
docs/INTERNALS.md+1 -1
| @@ -35,7 +35,7 @@ versions of libs and build tools. | |
| - libidn2 2.0.0 | |
| - wolfSSL 3.4.6 | |
| - OpenLDAP 2.0 | |
| - | - MIT Kerberos 1.2.4 |
| + | - MIT Kerberos 1.3 |
| - nghttp2 1.15.0 | |
| ## Build tools | |
lib/curl_config.h.cmake+0 -3
| @@ -315,9 +315,6 @@ | |
| /* if you have the gssapi libraries */ | |
| #cmakedefine HAVE_GSSAPI 1 | |
| - | /* Define to 1 if you have the <gssapi/gssapi.h> header file. */ |
| - | #cmakedefine HAVE_GSSAPI_GSSAPI_H 1 |
| - | |
| /* if you have the GNU gssapi libraries */ | |
| #cmakedefine HAVE_GSSGNU 1 | |
lib/urldata.h+1 -3
| @@ -190,10 +190,8 @@ typedef CURLcode (Curl_recv)(struct Curl_easy *data, /* transfer */ | |
| #ifdef HAVE_GSSAPI | |
| # ifdef HAVE_GSSGNU | |
| # include <gss.h> | |
| - | # elif defined HAVE_GSSAPI_GSSAPI_H |
| - | # include <gssapi/gssapi.h> |
| # else | |
| - | # include <gssapi.h> |
| + | # include <gssapi/gssapi.h> |
| # endif | |
| #endif | |
lib/vauth/vauth.h+1 -3
| @@ -236,10 +236,8 @@ CURLcode Curl_auth_create_xoauth_bearer_message(const char *user, | |
| #ifdef HAVE_GSSAPI | |
| # ifdef HAVE_GSSGNU | |
| # include <gss.h> | |
| - | # elif defined HAVE_GSSAPI_GSSAPI_H |
| - | # include <gssapi/gssapi.h> |
| # else | |
| - | # include <gssapi.h> |
| + | # include <gssapi/gssapi.h> |
| # endif | |
| #endif | |