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
574cde9b
Commit
574cde9b
authored
Jan 26, 2019
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix failing openssl_1 test
if ssl_cipher is not specified, it must be NULL, not ""
parent
9b76e284
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
sql/sql_acl.cc
sql/sql_acl.cc
+5
-3
No files found.
sql/sql_acl.cc
View file @
574cde9b
...
...
@@ -1233,21 +1233,23 @@ class User_table_json: public User_table
access
|=
rights
;
set_int_value
(
"access"
,
access
&
GLOBAL_ACLS
);
}
const
char
*
unsafe_str
(
const
char
*
s
)
const
{
return
s
[
0
]
?
s
:
NULL
;
}
SSL_type
get_ssl_type
()
const
{
return
(
SSL_type
)
get_int_value
(
"ssl_type"
);
}
int
set_ssl_type
(
SSL_type
x
)
const
{
return
set_int_value
(
"ssl_type"
,
x
);
}
const
char
*
get_ssl_cipher
(
MEM_ROOT
*
root
)
const
{
return
get_str_value
(
root
,
"ssl_cipher"
);
}
{
return
unsafe_str
(
get_str_value
(
root
,
"ssl_cipher"
)
);
}
int
set_ssl_cipher
(
const
char
*
s
,
size_t
l
)
const
{
return
set_str_value
(
"ssl_cipher"
,
s
,
l
);
}
const
char
*
get_x509_issuer
(
MEM_ROOT
*
root
)
const
{
return
get_str_value
(
root
,
"x509_issuer"
);
}
{
return
unsafe_str
(
get_str_value
(
root
,
"x509_issuer"
)
);
}
int
set_x509_issuer
(
const
char
*
s
,
size_t
l
)
const
{
return
set_str_value
(
"x509_issuer"
,
s
,
l
);
}
const
char
*
get_x509_subject
(
MEM_ROOT
*
root
)
const
{
return
get_str_value
(
root
,
"x509_subject"
);
}
{
return
unsafe_str
(
get_str_value
(
root
,
"x509_subject"
)
);
}
int
set_x509_subject
(
const
char
*
s
,
size_t
l
)
const
{
return
set_str_value
(
"x509_subject"
,
s
,
l
);
}
longlong
get_max_questions
()
const
...
...
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