changeset 10276:e556ff1dbab1 HEAD

lib-master: Don't try to close config fd early after all. Login processes can do another config lookup when TLS hostname is given.
author Timo Sirainen <tss@iki.fi>
date Mon, 09 Nov 2009 14:34:22 -0500
parents 2526861b8417
children 09dd23dd6ee0
files src/lib-master/master-service.c
diffstat 1 files changed, 1 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-master/master-service.c	Mon Nov 09 13:42:59 2009 -0500
+++ b/src/lib-master/master-service.c	Mon Nov 09 14:34:22 2009 -0500
@@ -640,7 +640,6 @@
 {
 	struct master_service *service = l->service;
 	struct master_service_connection conn;
-	bool close_config;
 
 	if (service->master_status.available_count == 0) {
 		/* we are full. stop listening for now, unless overflow
@@ -682,22 +681,12 @@
 	conn.ssl = l->ssl;
 	net_set_nonblock(conn.fd, TRUE);
 
-	if (service->login_connections)
-		close_config = FALSE;
-	else {
+	if (!service->login_connections) {
 		i_assert(service->master_status.available_count > 0);
 		service->master_status.available_count--;
 		master_status_update(service);
-		close_config = service->master_status.available_count == 0 &&
-			service->service_count_left == 1;
 	}
-
 	service->callback(&conn);
-
-	if (close_config) {
-		/* we're dying as soon as this connection closes. */
-		master_service_close_config_fd(service);
-	}
 }
 
 static void io_listeners_init(struct master_service *service)