From: Viktor Szakats <commit@vsz.me>
Date: Fri, 10 Oct 2025 00:49:46 +0000 (+0200)
Subject: kerberos: stop including `gssapi/gssapi_generic.h`
X-Git-Tag: rc-8_17_0-1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5950b2d372ac4f15f6b348227f462d4c3c4d37a;p=thirdparty%2Fcurl.git

kerberos: stop including `gssapi/gssapi_generic.h`

It's a legacy MIT Kerberos header that's no longer used by curl since:
355bf01c828af16c47ab52bccb9ade769f8bf158 (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:
99185417952da30c8ddd82ab962fb58da96260b2 (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
---

diff --git a/.github/scripts/cmp-config.pl b/.github/scripts/cmp-config.pl
index 5fb8c0abdc..4284fcaee7 100755
--- a/.github/scripts/cmp-config.pl
+++ b/.github/scripts/cmp-config.pl
@@ -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,
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1c8fa32c5..387dd57dc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 9f37bbb6e2..3f0bcf22ee 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -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
 
diff --git a/lib/urldata.h b/lib/urldata.h
index d924b91194..cdf028853e 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -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
diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h
index 57fd27a6a7..26e5adc628 100644
--- a/lib/vauth/vauth.h
+++ b/lib/vauth/vauth.h
@@ -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 */