From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 17 Dec 2022 19:49:17 +0000 (+0200)
Subject: lib-master, lib-login: Remove master_service_close_config_fd()
X-Git-Tag: 2.4.0~3056
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d15a97481af87a3ebca83e030775426f449ada03;p=thirdparty%2Fdovecot%2Fcore.git

lib-master, lib-login: Remove master_service_close_config_fd()

Config fd is now always kept open and it shouldn't be closed.
---

diff --git a/src/lib-login/login-server.c b/src/lib-login/login-server.c
index 94591c74c7..c4005f5a9c 100644
--- a/src/lib-login/login-server.c
+++ b/src/lib-login/login-server.c
@@ -249,8 +249,6 @@ static void login_server_auth_finish(struct login_server_request *request,
 		/* we're dying as soon as this connection closes. */
 		i_assert(login_server_auth_request_count(server->auth) == 0);
 		login_server_auth_disconnect(server->auth);
-
-		master_service_close_config_fd(service);
 	} else if (server->stopping) {
 		/* try stopping again */
 		login_server_stop(server);
@@ -558,8 +556,6 @@ static void login_server_conn_unref(struct login_server_connection **_conn)
 void login_server_stop(struct login_server *server)
 {
 	server->stopping = TRUE;
-	if (login_server_auth_request_count(server->auth) == 0) {
+	if (login_server_auth_request_count(server->auth) == 0)
 		login_server_auth_disconnect(server->auth);
-		master_service_close_config_fd(server->service);
-	}
 }
diff --git a/src/lib-master/master-service-private.h b/src/lib-master/master-service-private.h
index 5a171ffa6a..1052370e19 100644
--- a/src/lib-master/master-service-private.h
+++ b/src/lib-master/master-service-private.h
@@ -106,7 +106,6 @@ struct master_service {
 
 void master_service_io_listeners_add(struct master_service *service);
 void master_status_update(struct master_service *service);
-void master_service_close_config_fd(struct master_service *service);
 
 void master_service_io_listeners_remove(struct master_service *service);
 void master_service_ssl_io_listeners_remove(struct master_service *service);
diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index fcee505310..73f5e327ed 100644
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -1496,11 +1496,6 @@ static void master_service_refresh_login_state(struct master_service *service)
 		master_service_set_login_state(service, state);
 }
 
-void master_service_close_config_fd(struct master_service *service)
-{
-	i_close_fd(&service->config_fd);
-}
-
 static void master_service_deinit_real(struct master_service **_service)
 {
 	struct master_service *service = *_service;
@@ -1526,7 +1521,7 @@ static void master_service_deinit_real(struct master_service **_service)
 
 	if (service->stats_client != NULL)
 		stats_client_deinit(&service->stats_client);
-	master_service_close_config_fd(service);
+	i_close_fd(&service->config_fd);
 	timeout_remove(&service->to_overflow_call);
 	timeout_remove(&service->to_die);
 	timeout_remove(&service->to_overflow_state);