dovecot-2.0-sslstream: lib-master: Don't try to close config fd ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/e556ff1dbab1
changeset: 10277:e556ff1dbab1
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Nov 09 14:34:22 2009 -0500
description:
lib-master: Don't try to close config fd early after all.
Login processes can do another config lookup when TLS hostname is given.

diffstat:

1 file changed, 2 insertions(+), 13 deletions(-)
src/lib-master/master-service.c |   15 ++-------------

diffs (36 lines):

diff -r 2526861b8417 -r e556ff1dbab1 src/lib-master/master-service.c
--- 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 @@ static void master_service_listen(struct
 {
 	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 @@ static void master_service_listen(struct
 	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)