database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Merge branch '3.1' into 3.3

Browse Source
This commit is contained in:
Georg Richter
2022-11-07 09:09:29 +01:00
parent 6d489dd7ed 45a5ee1724
commit d9af4fcbc6
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -45,6 +45,7 @@ jobs:
os: windows os: windows
language: shell language: shell
- env: srv=mariadb v=10.3 local=1 - env: srv=mariadb v=10.3 local=1
dist: bionic
- env: srv=mariadb v=10.4 local=1 - env: srv=mariadb v=10.4 local=1
- env: srv=mariadb v=10.5 local=1 - env: srv=mariadb v=10.5 local=1
- env: srv=mariadb v=10.6 local=1 - env: srv=mariadb v=10.6 local=1

2
CMakeLists.txt
View File

@@ -5,7 +5,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
INCLUDE(CheckFunctionExists) INCLUDE(CheckFunctionExists)
IF(COMMAND CMAKE_POLICY) IF(COMMAND CMAKE_POLICY)
SET(NEW_POLICIES CMP0003 CMP0022 CMP0023 CMP0077 CMP0069 CMP0075) SET(NEW_POLICIES CMP0003 CMP0022 CMP0023 CMP0057 CMP0077 CMP0069 CMP0075)
FOREACH(TYPE OLD NEW) FOREACH(TYPE OLD NEW)
FOREACH(P ${${TYPE}_POLICIES}) FOREACH(P ${${TYPE}_POLICIES})
IF(POLICY ${P}) IF(POLICY ${P})

2
libmariadb/secure/openssl.c
View File

@@ -688,7 +688,7 @@ int ma_tls_verify_server_cert(MARIADB_TLS *ctls)
return 1; return 1;
} }
#ifdef HAVE_OPENSSL_CHECK_HOST #ifdef HAVE_OPENSSL_CHECK_HOST
if (X509_check_host(cert, mysql->host, 0, 0, 0) != 1 if (X509_check_host(cert, mysql->host, strlen(mysql->host), 0, 0) != 1
&& X509_check_ip_asc(cert, mysql->host, 0) != 1) && X509_check_ip_asc(cert, mysql->host, 0) != 1)
goto error; goto error;
#else #else

7
plugins/auth/CMakeLists.txt
View File

@@ -99,7 +99,10 @@ IF(NOT WIN32)
INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake) INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
IF(GSSAPI_FOUND) IF(GSSAPI_FOUND)
SET(GSSAPI_SOURCES ${AUTH_DIR}/auth_gssapi_client.c ${AUTH_DIR}/gssapi_client.c ${AUTH_DIR}/gssapi_errmsg.c) SET(GSSAPI_SOURCES ${AUTH_DIR}/auth_gssapi_client.c ${AUTH_DIR}/gssapi_client.c ${AUTH_DIR}/gssapi_errmsg.c)
CHECK_C_COMPILER_FLAG(-Wl,--as-needed have_C__Wl___as_needed) IF (CMAKE_VERSION VERSION_GREATER 3.18)
INCLUDE(CheckLinkerFlag)
CHECK_LINKER_FLAG(C -Wl,--as-needed have__Wl___as_needed)
ENDIF()
ENDIF() ENDIF()
SET(AUTH_GSSAPI_DEFAULT_CONFIG DYNAMIC) SET(AUTH_GSSAPI_DEFAULT_CONFIG DYNAMIC)
ELSE() ELSE()
@@ -118,7 +121,7 @@ IF(GSSAPI_SOURCES)
IF(CMAKE_C_COMPILER_ID MATCHES "Clang") IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
SET_SOURCE_FILES_PROPERTIES(${GSSAPI_SOURCES} PROPERTY COMPILE_FLAGS "-Wno-deprecated-declarations") SET_SOURCE_FILES_PROPERTIES(${GSSAPI_SOURCES} PROPERTY COMPILE_FLAGS "-Wno-deprecated-declarations")
ENDIF() ENDIF()
IF(have_C__Wl___as_needed) IF(have__Wl___as_needed)
SET_TARGET_PROPERTIES(auth_gssapi_client PROPERTIES LINK_FLAGS "-Wl,--as-needed") SET_TARGET_PROPERTIES(auth_gssapi_client PROPERTIES LINK_FLAGS "-Wl,--as-needed")
ENDIF() ENDIF()
ENDIF() ENDIF()