From 1f2620c43d81837e950715770ebc70c992b0c7b2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 7 Nov 2023 00:25:18 +0000 Subject: [PATCH 1/3] delete unused `HAVE_GSSHEIMDAL` --- CMakeLists.txt | 5 ++--- configure.ac | 5 +---- lib/config-os400.h | 3 --- lib/curl_config.h.cmake | 3 --- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0abc284db2d7c..699bc6d017ef69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -927,9 +927,8 @@ if(CURL_USE_GSSAPI) check_include_file_concat("gssapi/gssapi_generic.h" HAVE_GSSAPI_GSSAPI_GENERIC_H) check_include_file_concat("gssapi/gssapi_krb5.h" HAVE_GSSAPI_GSSAPI_KRB5_H) - if(GSS_FLAVOUR STREQUAL "Heimdal") - set(HAVE_GSSHEIMDAL ON) - else() # MIT + if(NOT GSS_FLAVOUR STREQUAL "Heimdal") + # MIT set(HAVE_GSSMIT ON) set(_INCLUDE_LIST "") if(HAVE_GSSAPI_GSSAPI_H) diff --git a/configure.ac b/configure.ac index d26a183f569d03..4202727ea970d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1850,10 +1850,7 @@ AC_INCLUDES_DEFAULT if test "x$not_mit" = "x1"; then dnl MIT not found, check for Heimdal AC_CHECK_HEADER(gssapi.h, - [ - dnl found - AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have Heimdal]) - ], + [], [ dnl no header found, disabling GSS want_gss=no diff --git a/lib/config-os400.h b/lib/config-os400.h index 357a36458b7224..3e456845e27842 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -116,9 +116,6 @@ /* Define if you have the GNU gssapi libraries */ #undef HAVE_GSSGNU -/* Define if you have the Heimdal gssapi libraries */ -#define HAVE_GSSHEIMDAL - /* Define if you have the MIT gssapi libraries */ #undef HAVE_GSSMIT diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 339358ea3621d6..f94478c1762828 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -298,9 +298,6 @@ /* if you have the GNU gssapi libraries */ #cmakedefine HAVE_GSSGNU 1 -/* if you have the Heimdal gssapi libraries */ -#cmakedefine HAVE_GSSHEIMDAL 1 - /* if you have the MIT gssapi libraries */ #cmakedefine HAVE_GSSMIT 1 From 68b22d05ed5e5ca1680c4f318d1316cf864bfdc1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 11 Dec 2023 20:04:57 +0000 Subject: [PATCH 2/3] delete unused `HAVE_GSSMIT` --- CMakeLists.txt | 1 - configure.ac | 1 - lib/config-os400.h | 3 --- lib/curl_config.h.cmake | 3 --- packages/vms/config_h.com | 16 ---------------- 5 files changed, 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 699bc6d017ef69..4c5e8796aef536 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -929,7 +929,6 @@ if(CURL_USE_GSSAPI) if(NOT GSS_FLAVOUR STREQUAL "Heimdal") # MIT - set(HAVE_GSSMIT ON) set(_INCLUDE_LIST "") if(HAVE_GSSAPI_GSSAPI_H) list(APPEND _INCLUDE_LIST "gssapi/gssapi.h") diff --git a/configure.ac b/configure.ac index 4202727ea970d9..7f75fb1d366d31 100644 --- a/configure.ac +++ b/configure.ac @@ -1859,7 +1859,6 @@ AC_INCLUDES_DEFAULT ) else dnl MIT found - AC_DEFINE(HAVE_GSSMIT, 1, [if you have MIT Kerberos]) dnl check if we have a really old MIT Kerberos version (<= 1.2) AC_MSG_CHECKING([if GSS-API headers declare GSS_C_NT_HOSTBASED_SERVICE]) AC_COMPILE_IFELSE([ diff --git a/lib/config-os400.h b/lib/config-os400.h index 3e456845e27842..32852bb378b6ff 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -116,9 +116,6 @@ /* Define if you have the GNU gssapi libraries */ #undef HAVE_GSSGNU -/* Define if you have the MIT gssapi libraries */ -#undef HAVE_GSSMIT - /* Define if you need the malloc.h header file even with stdlib.h */ /* #define NEED_MALLOC_H 1 */ diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index f94478c1762828..6f7f43eee85ce9 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -298,9 +298,6 @@ /* if you have the GNU gssapi libraries */ #cmakedefine HAVE_GSSGNU 1 -/* if you have the MIT gssapi libraries */ -#cmakedefine HAVE_GSSMIT 1 - /* Define to 1 if you have the `idna_strerror' function. */ #cmakedefine HAVE_IDNA_STRERROR 1 diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com index 6e4e03963602b5..b1cfc3cb73fe75 100644 --- a/packages/vms/config_h.com +++ b/packages/vms/config_h.com @@ -1387,22 +1387,6 @@ $ write tf "#endif" $ goto cfgh_in_loop1 $ endif $! -$! This is really do we have the newer MIT Kerberos -$!---------------------------------------------------------------------- -$ if (key2 .eqs. "HAVE_GSSMIT") -$ then -$ if f$search(test_mit) .nes. "" -$ then -$ write tf "#ifndef ''key2'" -$ write tf "#define ''key2' 1" -$ else -$ write tf "#ifdef ''key2'" -$ write tf "#undef ''key2'" -$ endif -$ write tf "#endif" -$ goto cfgh_in_loop1 -$ endif -$! $! Older MIT looks like Heimdal $!------------------------------------------------ $ if (key2 .eqs. "HAVE_HEIMDAL") From f0f3be473b9970f875baa77e6face572653f3d88 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 7 Nov 2023 00:46:53 +0000 Subject: [PATCH 3/3] delete unused `HAVE_HEIMDAL` --- packages/vms/config_h.com | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com index b1cfc3cb73fe75..6378802ad84c76 100644 --- a/packages/vms/config_h.com +++ b/packages/vms/config_h.com @@ -1386,22 +1386,6 @@ $ write tf "#define ''key2' 1" $ write tf "#endif" $ goto cfgh_in_loop1 $ endif -$! -$! Older MIT looks like Heimdal -$!------------------------------------------------ -$ if (key2 .eqs. "HAVE_HEIMDAL") -$ then -$ if f$search(test_mit) .eqs. "" -$ then -$ write tf "#ifndef ''key2'" -$ write tf "#define ''key2' 1" -$ else -$ write tf "#ifdef ''key2'" -$ write tf "#undef ''key2'" -$ endif -$ write tf "#endif" -$ goto cfgh_in_loop1 -$ endif $ endif $! $ endif