mysql_adaptor: unexpose dlsym API/service names

Author: jengelh

Makefile.am

@@ -181,7 +181,7 @@ libgxs_mysql_adaptor_la_LIBADD = -lpthread ${crypt_LIBS} ${libHX_LIBS} ${fmt_LIB
 EXTRA_libgxs_mysql_adaptor_la_DEPENDENCIES = default.sym
 libgxs_ruleproc_la_SOURCES = lib/ruleproc.cpp
 libgxs_ruleproc_la_LDFLAGS = ${default_SYFLAGS}
-libgxs_ruleproc_la_LIBADD = ${vmime_LIBS} libgromox_common.la libgromox_exrpc.la
+libgxs_ruleproc_la_LIBADD = ${vmime_LIBS} libgromox_common.la libgromox_exrpc.la libgxs_mysql_adaptor.la
 EXTRA_libgxs_ruleproc_la_DEPENDENCIES = ${default_SYM}
 
 cgkrepair_SOURCES = tools/cgkrepair.cpp tools/genimport.cpp tools/genimport.hpp

exch/mysql_adaptor/sql2.cpp

@@ -713,40 +713,5 @@ BOOL SVC_mysql_adaptor(enum plugin_op reason, const struct dlfuncs &data)
 		mlog(LV_ERR, "mysql_adaptor: failed to startup");
 		return false;
 	}
-#define E(f, s) do { \
-	if (!register_service((s), mysql_adaptor_ ## f)) { \
-		mlog(LV_ERR, "mysql_adaptor: failed to register the \"%s\" service", (s)); \
-		return false; \
-	} \
-} while (false)
-	E(meta, "mysql_auth_meta");
-	E(login2, "mysql_auth_login2");
-	E(setpasswd, "set_password");
-	E(get_username_from_id, "get_username_from_id");
-	E(get_id_from_maildir, "get_id_from_maildir");
-	E(get_user_displayname, "get_user_displayname");
-	E(get_user_privilege_bits, "get_user_privilege_bits");
-	E(set_user_lang, "set_user_lang");
-	E(set_timezone, "set_timezone");
-	E(get_homedir, "get_homedir");
-	E(get_homedir_by_id, "get_homedir_by_id");
-	E(get_id_from_homedir, "get_id_from_homedir");
-	E(get_user_ids, "get_user_ids");
-	E(get_domain_ids, "get_domain_ids");
-	E(get_org_domains, "get_org_domains");
-	E(get_domain_info, "get_domain_info");
-	E(check_same_org, "check_same_org");
-	E(get_domain_groups, "get_domain_groups");
-	E(get_group_users, "get_group_users");
-	E(get_domain_users, "get_domain_users");
-	E(check_mlist_include, "check_mlist_include");
-	E(check_same_org2, "check_same_org2");
-	E(get_mlist_memb, "get_mlist_memb");
-	E(get_user_aliases, "get_user_aliases");
-	E(get_user_properties, "get_user_properties");
-	E(scndstore_hints, "scndstore_hints");
-	E(domain_list_query, "domain_list_query");
-	E(get_homeserver, "get_homeserver");
-#undef E
 	return TRUE;
 }

lib/ruleproc.cpp

@@ -140,7 +140,6 @@ struct rxparam {
 }
 
 unsigned int g_ruleproc_debug;
-static bool (*rp_getuserprops)(const char *, TPROPVAL_ARRAY &);
 static std::string rp_smtp_url;
 static thread_local alloc_context rp_alloc_ctx;
 static thread_local const char *rp_storedir;
@@ -875,7 +874,7 @@ static ec_error_t opx_process(rxparam &par, const rule_node &rule)
 static ec_error_t mr_get_policy(const char *ev_to, mr_policy &pol)
 {
 	TPROPVAL_ARRAY uprop{};
-	if (!rp_getuserprops(ev_to, uprop))
+	if (!mysql_adaptor_get_user_properties(ev_to, uprop))
 		return ecError;
 	auto flag = uprop.get<const uint8_t>(PR_SCHDINFO_DISALLOW_OVERLAPPING_APPTS);
 	pol.decline_overlap = flag != nullptr && *flag != 0;
@@ -1278,8 +1277,6 @@ BOOL SVC_ruleproc(enum plugin_op reason, const struct dlfuncs &param)
 	if (reason != PLUGIN_INIT)
 		return TRUE;
 	LINK_SVC_API(param);
-	if (query_service2("get_user_properties", rp_getuserprops) == nullptr)
-		return false;
 	if (!register_service("rules_execute", exmdb_local_rules_execute))
 		return false;
 	auto cfg = config_file_prg(nullptr, "gromox.cfg", rp_config_defaults);