Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ea921fd8
Commit
ea921fd8
authored
Aug 30, 2023
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enable --ssl in the server by default
except in bootstrap
parent
9f93630d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
sql/mysqld.cc
sql/mysqld.cc
+3
-2
No files found.
sql/mysqld.cc
View file @
ea921fd8
...
@@ -1478,7 +1478,7 @@ Query_cache query_cache;
...
@@ -1478,7 +1478,7 @@ Query_cache query_cache;
#endif
#endif
my_bool
opt_use_ssl
=
0
;
my_bool
opt_use_ssl
=
1
;
char
*
opt_ssl_ca
=
NULL
,
*
opt_ssl_capath
=
NULL
,
*
opt_ssl_cert
=
NULL
,
char
*
opt_ssl_ca
=
NULL
,
*
opt_ssl_capath
=
NULL
,
*
opt_ssl_cert
=
NULL
,
*
opt_ssl_cipher
=
NULL
,
*
opt_ssl_key
=
NULL
,
*
opt_ssl_crl
=
NULL
,
*
opt_ssl_cipher
=
NULL
,
*
opt_ssl_key
=
NULL
,
*
opt_ssl_crl
=
NULL
,
*
opt_ssl_crlpath
=
NULL
,
*
opt_tls_version
=
NULL
;
*
opt_ssl_crlpath
=
NULL
,
*
opt_tls_version
=
NULL
;
...
@@ -6714,7 +6714,7 @@ struct my_option my_long_options[]=
...
@@ -6714,7 +6714,7 @@ struct my_option my_long_options[]=
#ifdef HAVE_OPENSSL
#ifdef HAVE_OPENSSL
{
"ssl"
,
0
,
{
"ssl"
,
0
,
"Enable SSL for connection (automatically enabled if an ssl option is used)."
,
"Enable SSL for connection (automatically enabled if an ssl option is used)."
,
&
opt_use_ssl
,
&
opt_use_ssl
,
0
,
GET_BOOL
,
OPT_ARG
,
0
,
0
,
0
,
&
opt_use_ssl
,
&
opt_use_ssl
,
0
,
GET_BOOL
,
OPT_ARG
,
1
,
0
,
0
,
0
,
0
,
0
},
0
,
0
,
0
},
#endif
#endif
#ifdef _WIN32
#ifdef _WIN32
...
@@ -8191,6 +8191,7 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument,
...
@@ -8191,6 +8191,7 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument,
break
;
break
;
case
OPT_BOOTSTRAP
:
case
OPT_BOOTSTRAP
:
opt_noacl
=
opt_bootstrap
=
1
;
opt_noacl
=
opt_bootstrap
=
1
;
opt_use_ssl
=
0
;
#ifdef _WIN32
#ifdef _WIN32
{
{
/*
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment