mirror of
https://github.com/curl/curl.git
synced 2026-08-25 06:53:31 +03:00
kerberos: bump minimum to 1.3 (2003-07-08), drop legacy logic
Previous minimum was: 1.2.4 (2002-02-28) - assume `gssapi/gssapi.h` header for MIT Kerberos. Drop logic detecting this header, and drop alternate logic including a bare "gssapi.h". Bare `gssapi.h` is Heimdal-specific. MIT Kerberos added support for it for Heimdal compatibility on 2006-11-09, redirecting to `gssapi/gssapi.h`. MIT Kerberos supported the latter header in the 1990s already. Ref:40e1a016f9(2008-03-06) Ref:d119352001(2006-11-09) - configure.ac: stop using `HAVE_GSSAPI_GSSAPI_H`. Added in 2010 to support "ancient distros such as RHEL-3" where `gssapi/gssapi_krb5.h` did not include `gssapi/gssapi.h`. MIT Kerberos includes it since commit:d9e959edfa(2003-03-06) Released in 1.3 (2003-07-08). Bump minimum required version to avoid this issue. Revertscca192e58f(2010-04-16) Ref: https://web.mit.edu/kerberos/dist/historic.html Ref: https://sources.debian.org/src/krb5/ Closes #18992
This commit is contained in:
parent
fc9b215fde
commit
0855f30709
7 changed files with 6 additions and 24 deletions
1
.github/scripts/cmp-config.pl
vendored
1
.github/scripts/cmp-config.pl
vendored
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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.")
|
||||
|
|
|
|||
11
configure.ac
11
configure.ac
|
|
@ -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])
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue