summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2023-03-16 21:48:08 +0100
committerSergei Golubchik <serg@mariadb.org>2023-03-16 21:48:08 +0100
commit84bb01b1d6eea76172f217d57bc9b611514a0815 (patch)
treec5f80d5a3aa1cc423312630215ae5a7ff516e69d
parent1d0d7c45dc8cd644715f3e5424df29bb39f4c958 (diff)
downloadmariadb-git-84bb01b1d6eea76172f217d57bc9b611514a0815.tar.gz
don't abort if invalid SSL setup
THIS INTRODUCES A SECURITY ISSUE - THE SERVER AUTOMATICALLY DISABLES SSL WHEN IT'S REQUIRED, SO A USER WILL THINK THE CONNECTION IS SECURE WHILE IN FACT IT SILENTLY WON'T BE. MUST NOT BE PUSHED INTO A MAIN BRANCH
-rw-r--r--sql/mysqld.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index df7605e95c2..87562016917 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4438,8 +4438,6 @@ static void init_ssl()
{
sql_print_error("Failed to setup SSL");
sql_print_error("SSL error: %s", sslGetErrString(error));
- if (!opt_bootstrap)
- unireg_abort(1);
opt_use_ssl = 0;
have_ssl= SHOW_OPTION_DISABLED;
}