mra: abolish dlsymming mysql_adaptor

Author: jengelh

mra/imap/imap.hpp

@@ -206,7 +206,6 @@ extern bool (*system_services_judge_ip)(const char *host, std::string &reason);
 extern bool (*system_services_judge_user)(const char *);
 extern void (*system_services_ban_user)(const char *, int);
 extern authmgr_login_t system_services_auth_login;
-extern gromox::errno_t (*system_services_auth_meta)(const char *username, unsigned int wantpriv, sql_meta_result &out);
 extern void (*system_services_install_event_stub)(void (*)(char *));
 extern void (*system_services_broadcast_event)(const char *);
 extern void (*system_services_broadcast_select)(const char *, const std::string &fld);

mra/imap/imap_cmd_parser.cpp

@@ -36,6 +36,7 @@
 #include <gromox/midb.hpp>
 #include <gromox/midb_agent.hpp>
 #include <gromox/mjson.hpp>
+#include <gromox/mysql_adaptor.hpp>
 #include <gromox/range_set.hpp>
 #include <gromox/simple_tree.hpp>
 #include <gromox/textmaps.hpp>
@@ -1351,7 +1352,7 @@ static int imap_cmd_parser_password2(int argc, char **argv,
 	if (target_mbox == nullptr) {
 		mres = std::move(mres_auth);
 	} else {
-		if (system_services_auth_meta(target_mbox, WANTPRIV_METAONLY, mres) != 0)
+		if (mysql_adaptor_meta(target_mbox, WANTPRIV_METAONLY, mres) != 0)
 			return 1902 | DISPATCH_CONTINUE | DISPATCH_TAG;
 		if (!store_owner_over(mres_auth.username.c_str(), mres.username.c_str(),
 		    mres.maildir.c_str())) {
@@ -1430,7 +1431,7 @@ int imap_cmd_parser_login(int argc, char **argv, imap_context *pcontext)
 	if (target_mbox == nullptr) {
 		mres = std::move(mres_auth);
 	} else {
-		if (system_services_auth_meta(target_mbox, WANTPRIV_METAONLY, mres) != 0)
+		if (mysql_adaptor_meta(target_mbox, WANTPRIV_METAONLY, mres) != 0)
 			return 1902 | DISPATCH_CONTINUE | DISPATCH_TAG;
 		if (!store_owner_over(mres_auth.username.c_str(), mres.username.c_str(),
 		    mres.maildir.c_str())) {

mra/imap/main.cpp

@@ -49,7 +49,6 @@ E(judge_ip)
 E(judge_user)
 E(ban_user)
 E(auth_login)
-E(auth_meta)
 E(install_event_stub)
 E(broadcast_event)
 E(broadcast_select)
@@ -170,7 +169,6 @@ static int system_services_run()
 	E(system_services_judge_user, "user_filter_judge");
 	E(system_services_ban_user, "user_filter_ban");
 	E(system_services_auth_login, "auth_login_gen");
-	E(system_services_auth_meta, "mysql_auth_meta");
 	E(system_services_install_event_stub, "install_event_stub");
 	E(system_services_broadcast_event, "broadcast_event");
 	E(system_services_broadcast_select, "broadcast_select");
@@ -184,7 +182,6 @@ static void system_services_stop()
 	service_release("ip_filter_judge", "system");
 	service_release("user_filter_judge", "system");
 	service_release("user_filter_ban", "system");
-	service_release("mysql_auth_meta", "system");
 	service_release("auth_login_gen", "system");
 	service_release("install_event_stub", "system");
 	service_release("broadcast_event", "system");

mra/pop3/main.cpp

@@ -48,7 +48,6 @@ E(judge_ip)
 E(judge_user)
 E(ban_user)
 E(auth_login)
-E(auth_meta)
 E(broadcast_event)
 #undef E
 
@@ -166,7 +165,6 @@ static int system_services_run()
 	E(system_services_judge_user, "user_filter_judge");
 	E(system_services_ban_user, "user_filter_ban");
 	E(system_services_auth_login, "auth_login_gen");
-	E(system_services_auth_meta, "mysql_auth_meta");
 	E(system_services_broadcast_event, "broadcast_event");
 	return 0;
 #undef E
@@ -177,7 +175,6 @@ static void system_services_stop()
 	service_release("ip_filter_judge", "system");
 	service_release("user_filter_judge", "system");
 	service_release("user_filter_ban", "system");
-	service_release("mysql_auth_meta", "system");
 	service_release("auth_login_gen", "system");
 	service_release("broadcast_event", "system");
 }

mra/pop3/pop3.hpp

@@ -103,7 +103,6 @@ extern bool (*system_services_judge_ip)(const char *host, std::string &reason);
 extern bool (*system_services_judge_user)(const char *);
 extern void (*system_services_ban_user)(const char *, int);
 extern authmgr_login_t system_services_auth_login;
-extern gromox::errno_t (*system_services_auth_meta)(const char *username, unsigned int wantpriv, sql_meta_result &out);
 extern void (*system_services_broadcast_event)(const char *);
 
 extern uint16_t g_listener_ssl_port;

mra/pop3/pop3_cmd_handler.cpp

@@ -26,6 +26,7 @@
 #include <gromox/fileio.h>
 #include <gromox/mail_func.hpp>
 #include <gromox/midb_agent.hpp>
+#include <gromox/mysql_adaptor.hpp>
 #include <gromox/util.hpp>
 #include "pop3.hpp"
 
@@ -138,7 +139,7 @@ int pop3_cmd_handler_pass(std::vector<std::string> &&argv, pop3_context *pcontex
 	if (target_mbox == nullptr) {
 		mres = std::move(mres_auth);
 	} else {
-		if (system_services_auth_meta(target_mbox, WANTPRIV_METAONLY, mres) != 0)
+		if (mysql_adaptor_meta(target_mbox, WANTPRIV_METAONLY, mres) != 0)
 			return 1715 | DISPATCH_CONTINUE;
 		if (!store_owner_over(mres_auth.username.c_str(), mres.username.c_str(),
 		    mres.maildir.c_str())) {