Skip to content

Commit e4e3bfd

Browse files
author
Tor Didriksen
committed
Bug #30995521 DISABLE KERBEROS FOR ALL PLATFORMS EXCEPT LINUX RPM AND DEB PACKAGES
Building with Kerberos headers/libraries is currently enabled for all platforms. This was implemented by Bug #30921806 ENABLE CUSTOM KERBEROS FOR STANDALONE LINUX BUILDS WL#12888: Kerberos authentication in MySQL. For MySQL 8.0.20 we want to disable this feature for all platforms, except for Linux RPM and DEB packages. Change-Id: I1b31cbd5085a4ff234645f0fe8777cb285cca974
1 parent b51f0be commit e4e3bfd

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

cmake/install_layout.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ IF(LINUX AND INSTALL_LAYOUT MATCHES "RPM")
118118
SET(LINUX_RPM 1)
119119
ENDIF()
120120

121+
IF(LINUX AND INSTALL_LAYOUT MATCHES "DEB")
122+
SET(LINUX_DEB 1)
123+
ENDIF()
124+
121125
IF(WIN32)
122126
SET(VALID_INSTALL_LAYOUTS "TARGZ" "STANDALONE")
123127
LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)

cmake/kerberos.cmake

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ STRING_APPEND(WITH_KERBEROS_DOC ", \nnone (skip kerberos)>")
3434

3535
STRING(REPLACE "\n" "| " WITH_KERBEROS_DOC_STRING "${WITH_KERBEROS_DOC}")
3636

37+
MACRO(RESET_KERBEROS_VARIABLES)
38+
UNSET(KERBEROS_LIB_CONFIGURED CACHE)
39+
UNSET(KERBEROS_LIB_CONFIGURED)
40+
UNSET(KERBEROS_INCLUDE_DIR)
41+
UNSET(KERBEROS_INCLUDE_DIR CACHE)
42+
UNSET(KERBEROS_LIBRARIES)
43+
UNSET(KERBEROS_LIBRARIES CACHE)
44+
ENDMACRO()
45+
3746
FUNCTION(WARN_MISSING_SYSTEM_KERBEROS OUTPUT_WARNING)
3847
IF(NOT KERBEROS_FOUND AND WITH_KERBEROS STREQUAL "system")
3948
MESSAGE(WARNING "Cannot find KERBEROS development libraries. "
@@ -189,6 +198,13 @@ MACRO(MYSQL_CHECK_KERBEROS)
189198
SET(WITH_KERBEROS "none" CACHE INTERNAL "")
190199
ENDIF()
191200

201+
IF(WITH_AUTHENTICATION_LDAP AND (LINUX_RPM OR LINUX_DEB))
202+
SET(WITH_KERBEROS "system" CACHE STRING "${WITH_KERBEROS_DOC_STRING}" FORCE)
203+
ELSE()
204+
RESET_KERBEROS_VARIABLES()
205+
SET(WITH_KERBEROS "none" CACHE STRING "${WITH_KERBEROS_DOC_STRING}" FORCE)
206+
ENDIF()
207+
192208
IF(NOT WITH_KERBEROS)
193209
IF(WITH_AUTHENTICATION_LDAP)
194210
SET(WITH_KERBEROS "system" CACHE STRING "${WITH_KERBEROS_DOC_STRING}")

0 commit comments

Comments
 (0)