From c5c6cc0363865908c24b4a6aa12682b96c2b8499 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Wed, 4 Dec 2019 11:39:59 +0200 Subject: [PATCH 1/2] Update 2.3 maintenance version --- VERSION23.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION23.cmake b/VERSION23.cmake index 8a7e5b227..31a8fa5e4 100644 --- a/VERSION23.cmake +++ b/VERSION23.cmake @@ -5,7 +5,7 @@ set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version") -set(MAXSCALE_VERSION_PATCH "15" CACHE STRING "Patch version") +set(MAXSCALE_VERSION_PATCH "16" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") From fa656c68705d4c126c2da232dd7b22ae52958326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 5 Dec 2019 10:00:30 +0200 Subject: [PATCH 2/2] Disable peer verification in kerberos_setup_ssl The test uses the command line client which doesn't provide certificates. --- maxscale-system-test/cnf/maxscale.cnf.template.kerberos_ssl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos_ssl b/maxscale-system-test/cnf/maxscale.cnf.template.kerberos_ssl index fea09d0c5..3b96da3e0 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos_ssl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.kerberos_ssl @@ -79,7 +79,7 @@ ssl=required ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem - +ssl_verify_peer_cert=false [Read-Connection-Listener-Slave] type=listener @@ -92,6 +92,7 @@ ssl=required ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem +ssl_verify_peer_cert=false [Read-Connection-Listener-Master] type=listener @@ -104,6 +105,7 @@ ssl=required ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_key=/###access_homedir###/certs/server-key.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem +ssl_verify_peer_cert=false [CLI-Listener] type=listener