git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

kerberos: stop including gssapi/gssapi_generic.h

Browse Source 
It's a legacy MIT Kerberos header that's no longer used by curl since:
355bf01c82 (2015-01-09)

There were still mentions of it after this patch, when using versions
<1.2.3, but those versions aren't supported since:
9918541795 (2008-06-12)

This header remains in use by autotools and cmake to detect MIT Kerberos
(vs. Heimdal, which doesn't have it.)

Ref: https://github.com/curl/curl/pull/18978#issuecomment-3387414995

Closes #18990
This commit is contained in:
Viktor Szakats 2025-10-10 02:49:46 +02:00
parent c049c37acd
commit e5950b2d37
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
5 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/scripts/cmp-config.pl vendored
View File

@ -45,6 +45,7 @@ my %remove = (
'#define HAVE_BROTLI 1' => 1,
'#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_KRB5_H 1' => 1,
'#define HAVE_INTTYPES_H 1' => 1,
'#define HAVE_LDAP_H 1' => 1,

1
CMakeLists.txt
View File

@ -1446,7 +1446,6 @@ if(CURL_USE_GSSAPI)
cmake_push_check_state()
list(APPEND CMAKE_REQUIRED_INCLUDES "${GSS_INCLUDE_DIRS}")
check_include_file("gssapi/gssapi.h" HAVE_GSSAPI_GSSAPI_H)
check_include_file("gssapi/gssapi_generic.h" HAVE_GSSAPI_GSSAPI_GENERIC_H)
cmake_pop_check_state()
endif()
else()

3
lib/curl_config.h.cmake
View File

@ -315,9 +315,6 @@
/* if you have the gssapi libraries */
#cmakedefine HAVE_GSSAPI 1
/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
#cmakedefine HAVE_GSSAPI_GSSAPI_GENERIC_H 1
/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
#cmakedefine HAVE_GSSAPI_GSSAPI_H 1

3
lib/urldata.h
View File

@ -195,9 +195,6 @@ typedef CURLcode (Curl_recv)(struct Curl_easy *data, /* transfer */
# else
# include <gssapi.h>
# endif
# ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
# include <gssapi/gssapi_generic.h>
# endif
#endif
#ifdef USE_LIBSSH2

3
lib/vauth/vauth.h
View File

@ -241,9 +241,6 @@ CURLcode Curl_auth_create_xoauth_bearer_message(const char *user,
# else
# include <gssapi.h>
# endif
# ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
# include <gssapi/gssapi_generic.h>
# endif
#endif
/* meta key for storing KRB5 meta at connection */