Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: delete unused HAVE_{GSSHEIMDAL,GSSMIT,HEIMDAL} #12506

Closed
wants to merge 3 commits into from
Closed

build: delete unused HAVE_{GSSHEIMDAL,GSSMIT,HEIMDAL} #12506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f2620c
delete unused `HAVE_GSSHEIMDAL`
vszakats Nov 7, 2023
68b22d0
delete unused `HAVE_GSSMIT`
vszakats Dec 11, 2023
f0f3be4
delete unused `HAVE_HEIMDAL`
vszakats Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -927,10 +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
set(HAVE_GSSMIT ON)
if(NOT GSS_FLAVOUR STREQUAL "Heimdal")
# MIT
set(_INCLUDE_LIST "")
if(HAVE_GSSAPI_GSSAPI_H)
list(APPEND _INCLUDE_LIST "gssapi/gssapi.h")
Expand Down
6 changes: 1 addition & 5 deletions configure.ac
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -1862,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([
Expand Down
6 changes: 0 additions & 6 deletions lib/config-os400.h
View file
Open in desktop
Expand Up @@ -116,12 +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

/* Define if you need the malloc.h header file even with stdlib.h */
/* #define NEED_MALLOC_H 1 */

Expand Down
6 changes: 0 additions & 6 deletions lib/curl_config.h.cmake
View file
Open in desktop
Expand Up @@ -298,12 +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

/* Define to 1 if you have the `idna_strerror' function. */
#cmakedefine HAVE_IDNA_STRERROR 1

Expand Down
32 changes: 0 additions & 32 deletions packages/vms/config_h.com
View file
Open in desktop
Expand Up @@ -1386,38 +1386,6 @@ $ write tf "#define ''key2' 1"
$ 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")
$ 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
Expand Down