From 9810c5fa69300642aa05628eda22e87787c08986 Mon Sep 17 00:00:00 2001
From: Marko <marko.rajala@mariadb.com>
Date: Tue, 7 May 2019 22:12:16 +0300
Subject: [PATCH] MXS-1957 Add MariaDBBackendAuth alias

---
 server/core/load_utils.cc                                  | 7 ++++---
 server/modules/authenticator/CMakeLists.txt                | 2 +-
 .../authenticator/MariaDBBackendAuth/CMakeLists.txt        | 4 ++++
 .../mysql_backend_auth.cc                                  | 2 +-
 .../modules/authenticator/MySQLBackendAuth/CMakeLists.txt  | 4 ----
 5 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 server/modules/authenticator/MariaDBBackendAuth/CMakeLists.txt
 rename server/modules/authenticator/{MySQLBackendAuth => MariaDBBackendAuth}/mysql_backend_auth.cc (99%)
 delete mode 100644 server/modules/authenticator/MySQLBackendAuth/CMakeLists.txt

diff --git a/server/core/load_utils.cc b/server/core/load_utils.cc
index 607849d9a..3125e91ae 100644
--- a/server/core/load_utils.cc
+++ b/server/core/load_utils.cc
@@ -65,9 +65,10 @@ struct NAME_MAPPING
 
 static NAME_MAPPING name_mappings[] =
 {
-    {MODULE_MONITOR,  "mysqlmon",     "mariadbmon",     false},
-    {MODULE_PROTOCOL, "mysqlclient",  "mariadbclient",  false},
-    {MODULE_PROTOCOL, "mysqlbackend", "mariadbbackend", false}
+    {MODULE_MONITOR,       "mysqlmon",         "mariadbmon",         false},
+    {MODULE_PROTOCOL,      "mysqlclient",      "mariadbclient",      false},
+    {MODULE_PROTOCOL,      "mysqlbackend",     "mariadbbackend",     false},
+    {MODULE_AUTHENTICATOR, "mysqlbackendauth", "mariadbbackendauth", false}
 };
 
 static const size_t N_NAME_MAPPINGS = sizeof(name_mappings) / sizeof(name_mappings[0]);
diff --git a/server/modules/authenticator/CMakeLists.txt b/server/modules/authenticator/CMakeLists.txt
index 695d3d6b1..3b7d4a749 100644
--- a/server/modules/authenticator/CMakeLists.txt
+++ b/server/modules/authenticator/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(GSSAPI)
 add_subdirectory(HTTPAuth)
 add_subdirectory(MaxAdminAuth)
 add_subdirectory(MySQLAuth)
-add_subdirectory(MySQLBackendAuth)
+add_subdirectory(MariaDBBackendAuth)
 add_subdirectory(NullAuthAllow)
 add_subdirectory(NullAuthDeny)
 add_subdirectory(PAM)
diff --git a/server/modules/authenticator/MariaDBBackendAuth/CMakeLists.txt b/server/modules/authenticator/MariaDBBackendAuth/CMakeLists.txt
new file mode 100644
index 000000000..7385f8da0
--- /dev/null
+++ b/server/modules/authenticator/MariaDBBackendAuth/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(mariadbbackendauth SHARED mysql_backend_auth.cc)
+target_link_libraries(mariadbbackendauth maxscale-common mysqlcommon)
+set_target_properties(mariadbbackendauth PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
+install_module(mariadbbackendauth core)
diff --git a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc b/server/modules/authenticator/MariaDBBackendAuth/mysql_backend_auth.cc
similarity index 99%
rename from server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc
rename to server/modules/authenticator/MariaDBBackendAuth/mysql_backend_auth.cc
index d3982ae63..c136e8180 100644
--- a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc
+++ b/server/modules/authenticator/MariaDBBackendAuth/mysql_backend_auth.cc
@@ -22,7 +22,7 @@
  * server.
  */
 
-#define MXS_MODULE_NAME "MySQLBackendAuth"
+#define MXS_MODULE_NAME "MariaDBBackendAuth"
 
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.hh>
diff --git a/server/modules/authenticator/MySQLBackendAuth/CMakeLists.txt b/server/modules/authenticator/MySQLBackendAuth/CMakeLists.txt
deleted file mode 100644
index e354a69a3..000000000
--- a/server/modules/authenticator/MySQLBackendAuth/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_library(mysqlbackendauth SHARED mysql_backend_auth.cc)
-target_link_libraries(mysqlbackendauth maxscale-common mysqlcommon)
-set_target_properties(mysqlbackendauth PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
-install_module(mysqlbackendauth core)