From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 9 Nov 2019 08:49:47 +0000 (+0200)
Subject: dns, login-common, stats: Finish service initialization later
X-Git-Tag: 2.3.10~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bafcc49da8a03f1eebf348e589b7164a859af34;p=thirdparty%2Fdovecot%2Fcore.git

dns, login-common, stats: Finish service initialization later

This way if there's a crash in the init code, master will start throttling
the service.
---

diff --git a/src/dns/dns-client.c b/src/dns/dns-client.c
index 7305f68a4d..fd39efa4e0 100644
--- a/src/dns/dns-client.c
+++ b/src/dns/dns-client.c
@@ -147,11 +147,10 @@ int main(int argc, char *argv[])
 	restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL);
 	restrict_access_allow_coredumps(TRUE);
 
-	master_service_init_finish(master_service);
-
 	/* setup connection list */
 	dns_clients = connection_list_init(&dns_client_set, &dns_client_vfuncs);
 
+	master_service_init_finish(master_service);
 	master_service_run(master_service, client_connected);
 
 	/* disconnect all clients */
diff --git a/src/login-common/main.c b/src/login-common/main.c
index fc860817b5..90956b29f7 100644
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -554,9 +554,9 @@ int login_binary_run(const struct login_binary *binary,
 				    &global_other_settings);
 
 	main_preinit();
-	master_service_init_finish(master_service);
 	main_init(login_socket);
 
+	master_service_init_finish(master_service);
 	master_service_run(master_service, client_connected);
 	main_deinit();
 	pool_unref(&set_pool);
diff --git a/src/stats/main.c b/src/stats/main.c
index cecdd31fc8..c635a3582f 100644
--- a/src/stats/main.c
+++ b/src/stats/main.c
@@ -96,8 +96,8 @@ int main(int argc, char *argv[])
 
 	main_preinit();
 
-	master_service_init_finish(master_service);
 	main_init();
+	master_service_init_finish(master_service);
 	master_service_run(master_service, client_connected);
 	main_deinit();
 	master_service_deinit(&master_service);