From a1b3dfff5480669d04f5ce5ead6fb44ceb718027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 17 Aug 2020 16:01:51 +0300 Subject: [PATCH] MXS-3114: Fix creation of listeners with sockets Backporting to 2.4. The socket parameter wasn't correctly extracted. --- server/core/config_runtime.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc index b75d14ce7..5d4eb1d52 100644 --- a/server/core/config_runtime.cc +++ b/server/core/config_runtime.cc @@ -2762,6 +2762,10 @@ bool runtime_create_listener_from_json(Service* service, json_t* json) get_string_or_null(json, MXS_JSON_PTR_PARAM_SSL_CERT_VERIFY_DEPTH); const char* ssl_verify_peer_certificate = get_string_or_null(json, MXS_JSON_PTR_PARAM_SSL_VERIFY_PEER_CERT); + if (!address) + { + address = get_string_or_null(json, MXS_JSON_PTR_PARAM_SOCKET); + } rval = runtime_create_listener(service, id,