exmdb: put local procedure callability check in the right spot

Fixes: gromox-3.1-145-gc52e4da7e

Author: jengelh

exch/exmdb/main.cpp

@@ -149,8 +149,8 @@ BOOL SVC_exmdb_provider(enum plugin_op reason, const struct dlfuncs &ppdata)
 		}
 		if (!exmdb_provider_reload(nullptr, pconfig))
 			return false;
-		g_exmdb_client_only = strcasecmp(get_prog_id(), "istore") != 0;
-		if (g_exmdb_client_only)
+		g_exmdb_disallow_lpc = strcasecmp(get_prog_id(), "istore") != 0;
+		if (g_exmdb_disallow_lpc)
 			return TRUE;
 
 		auto listen_ip = pconfig->get_value("listen_ip");
@@ -228,7 +228,7 @@ BOOL SVC_exmdb_provider(enum plugin_op reason, const struct dlfuncs &ppdata)
 			db_engine_stop();
 			return FALSE;
 		}
-		if (!g_exmdb_client_only && exmdb_listener_trigger_accept() != 0) {
+		if (!g_exmdb_disallow_lpc && exmdb_listener_trigger_accept() != 0) {
 			mlog(LV_ERR, "exmdb_provider: failed to start exmdb listener");
 			exmdb_listener_stop();
 			exmdb_parser_stop();

exch/exmdb/parser.cpp

@@ -48,7 +48,6 @@ static std::vector<EXMDB_ITEM> g_local_list;
 static std::unordered_set<std::shared_ptr<ROUTER_CONNECTION>> g_router_list;
 static std::unordered_set<std::shared_ptr<EXMDB_CONNECTION>> g_connection_list;
 static std::mutex g_router_lock, g_connection_lock;
-bool g_exmdb_client_only;
 unsigned int g_enable_dam;
 
 ROUTER_CONNECTION::~ROUTER_CONNECTION()
@@ -81,8 +80,6 @@ std::unique_ptr<EXMDB_CONNECTION> exmdb_parser_make_conn()
 
 static bool exmdb_parser_is_local(const char *prefix, BOOL *pb_private)
 {
-	if (g_exmdb_client_only)
-		return false;
 	if (*prefix == '\0')
 		return true;
 	auto i = std::find_if(g_local_list.cbegin(), g_local_list.cend(),

exch/exmdb/parser.hpp

@@ -44,4 +44,3 @@ extern void exmdb_parser_insert_router(std::shared_ptr<ROUTER_CONNECTION> &&);
 extern BOOL exmdb_parser_erase_router(const std::shared_ptr<ROUTER_CONNECTION> &);
 
 extern unsigned int g_exrpc_debug, g_enable_dam;
-extern bool g_exmdb_client_only;

include/gromox/exmdb_client.hpp

@@ -99,5 +99,6 @@ class GX_EXPORT exmdb_client_remote {
 };
 
 extern GX_EXPORT std::optional<exmdb_client_remote> exmdb_client;
+extern GX_EXPORT bool g_exmdb_disallow_lpc;
 
 }

lib/exmdb_client.cpp

@@ -34,6 +34,7 @@
 namespace gromox {
 
 std::optional<exmdb_client_remote> exmdb_client;
+bool g_exmdb_disallow_lpc;
 
 static int mdcl_rpc_timeout = -1;
 static constexpr unsigned int mdcl_ping_timeout = 2;
@@ -436,6 +437,8 @@ int exmdb_client_run(const char *cfgdir, unsigned int flags,
 
 bool exmdb_client_is_local(const char *prefix, BOOL *pvt)
 {
+	if (g_exmdb_disallow_lpc)
+		return false;
 	if (*prefix == '\0')
 		return true;
 	auto i = std::find_if(mdcl_server_list.cbegin(), mdcl_server_list.cend(),