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
8fd515e0
Commit
8fd515e0
authored
Apr 20, 2024
by
Julius Goryavsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HASHICORP_KEY_MANAGEMENT: MDEV-33420 post-fix
Compilation correction after MDEV-33420.
parent
3f9f5ca4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
plugin/hashicorp_key_management/CMakeLists.txt
plugin/hashicorp_key_management/CMakeLists.txt
+6
-1
plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc
...shicorp_key_management/hashicorp_key_management_plugin.cc
+5
-1
No files found.
plugin/hashicorp_key_management/CMakeLists.txt
View file @
8fd515e0
FIND_PACKAGE
(
CURL
)
IF
(
NOT CURL_FOUND
)
# Can't build plugin
MESSAGE_ONCE
(
WARNING
"Hashicorp Key Management plugin requires curl development package"
)
RETURN
()
ENDIF
()
SET_PACKAGE_PROPERTIES
(
CURL PROPERTIES TYPE REQUIRED
)
INCLUDE_DIRECTORIES
(
${
CURL_INCLUDE_DIRS
}
)
set
(
CPACK_RPM_hashicorp-key-management_PACKAGE_SUMMARY
"Hashicorp Key Management plugin for MariaDB"
PARENT_SCOPE
)
set
(
CPACK_RPM_hashicorp-key-management_PACKAGE_DESCRIPTION
"This encryption plugin uses Hashicorp Vault for storing encryption
keys for MariaDB Data-at-Rest encryption."
PARENT_SCOPE
)
MYSQL_ADD_PLUGIN
(
HASHICORP_KEY_MANAGEMENT
hashicorp_key_management_plugin.cc
LINK_LIBRARIES
CURL::libcurl
LINK_LIBRARIES
${
CURL_LIBRARIES
}
CONFIG hashicorp_key_management.cnf
COMPONENT hashicorp-key-management
MODULE_ONLY
)
...
...
plugin/hashicorp_key_management/hashicorp_key_management_plugin.cc
View file @
8fd515e0
...
...
@@ -987,7 +987,11 @@ int HCData::init ()
bool
not_equal
=
token_env
!=
NULL
&&
strcmp
(
token_env
,
token
)
!=
0
;
if
(
token_env
==
NULL
||
not_equal
)
{
setenv
(
"VAULT_TOKEN"
,
token
,
1
);
#if defined(HAVE_SETENV) || !defined(_WIN32)
setenv
(
"VAULT_TOKEN"
,
token
,
1
);
#else
_putenv_s
(
"VAULT_TOKEN"
,
token
);
#endif
if
(
not_equal
)
{
my_printf_error
(
ER_UNKNOWN_ERROR
,
PLUGIN_ERROR_HEADER
...
...
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