hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1957 Add MariaDBAuth alias

Browse Source
This commit is contained in:
Marko
2019-05-09 11:24:58 +03:00
parent 9810c5fa69
commit 50fef6f361
8 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/load_utils.cc
View File

@ -68,6 +68,7 @@ static NAME_MAPPING name_mappings[] =
{MODULE_MONITOR, "mysqlmon", "mariadbmon", false}, {MODULE_MONITOR, "mysqlmon", "mariadbmon", false},
{MODULE_PROTOCOL, "mysqlclient", "mariadbclient", false}, {MODULE_PROTOCOL, "mysqlclient", "mariadbclient", false},
{MODULE_PROTOCOL, "mysqlbackend", "mariadbbackend", false}, {MODULE_PROTOCOL, "mysqlbackend", "mariadbbackend", false},
{MODULE_AUTHENTICATOR, "mysqlauth", "mariadbauth", false},
{MODULE_AUTHENTICATOR, "mysqlbackendauth", "mariadbbackendauth", false} {MODULE_AUTHENTICATOR, "mysqlbackendauth", "mariadbbackendauth", false}
}; };

2
server/modules/authenticator/CMakeLists.txt
View File

@ -5,7 +5,7 @@ endif()
add_subdirectory(GSSAPI) add_subdirectory(GSSAPI)
add_subdirectory(HTTPAuth) add_subdirectory(HTTPAuth)
add_subdirectory(MaxAdminAuth) add_subdirectory(MaxAdminAuth)
add_subdirectory(MySQLAuth) add_subdirectory(MariaDBAuth)
add_subdirectory(MariaDBBackendAuth) add_subdirectory(MariaDBBackendAuth)
add_subdirectory(NullAuthAllow) add_subdirectory(NullAuthAllow)
add_subdirectory(NullAuthDeny) add_subdirectory(NullAuthDeny)

8
server/modules/authenticator/MariaDBAuth/CMakeLists.txt Normal file
View File

@ -0,0 +1,8 @@
if(SQLITE_VERSION VERSION_LESS 3.3 AND NOT BUILD_SYSTEM_TESTS)
message(FATAL_ERROR "SQLite version 3.3 or higher is required")
else()
add_library(mariadbauth SHARED mysql_auth.cc dbusers.cc)
target_link_libraries(mariadbauth maxscale-common mysqlcommon)
set_target_properties(mariadbauth PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
install_module(mariadbauth core)
endif()

0
server/modules/authenticator/MySQLAuth/dbusers.cc → server/modules/authenticator/MariaDBAuth/dbusers.cc
View File

0
server/modules/authenticator/MySQLAuth/mysql_auth.cc → server/modules/authenticator/MariaDBAuth/mysql_auth.cc
View File

2
server/modules/authenticator/MySQLAuth/mysql_auth.hh → server/modules/authenticator/MariaDBAuth/mysql_auth.hh
View File

@ -12,7 +12,7 @@
*/ */
#pragma once #pragma once
#define MXS_MODULE_NAME "MySQLAuth" #define MXS_MODULE_NAME "MariaDBAuth"
#include <maxscale/ccdefs.hh> #include <maxscale/ccdefs.hh>

8
server/modules/authenticator/MySQLAuth/CMakeLists.txt
View File

@ -1,8 +0,0 @@
if(SQLITE_VERSION VERSION_LESS 3.3 AND NOT BUILD_SYSTEM_TESTS)
message(FATAL_ERROR "SQLite version 3.3 or higher is required")
else()
add_library(mysqlauth SHARED mysql_auth.cc dbusers.cc)
target_link_libraries(mysqlauth maxscale-common mysqlcommon)
set_target_properties(mysqlauth PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
install_module(mysqlauth core)
endif()

4
server/modules/protocol/MySQL/mariadbbackend/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_library(mariadbbackend SHARED mysql_backend.cc) add_library(mariadbbackend SHARED mysql_backend.cc)
# TODO: Refactor mariadbbackend so that COM_CHANGE_USER processing is # TODO: Refactor mariadbbackend so that COM_CHANGE_USER processing is
# transparent to the protocol module. After this change, we don't need to # transparent to the protocol module. After this change, we don't need to
# link against mysqlauth. # link against mariadbauth.
target_link_libraries(mariadbbackend maxscale-common mysqlcommon mysqlauth) target_link_libraries(mariadbbackend maxscale-common mysqlcommon mariadbauth)
set_target_properties(mariadbbackend PROPERTIES VERSION "2.0.0") set_target_properties(mariadbbackend PROPERTIES VERSION "2.0.0")
install_module(mariadbbackend core) install_module(mariadbbackend core)