]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-master: Don't try to close config fd early after all.
authorTimo Sirainen <tss@iki.fi>
Mon, 9 Nov 2009 19:34:22 +0000 (14:34 -0500)
committerTimo Sirainen <tss@iki.fi>
Mon, 9 Nov 2009 19:34:22 +0000 (14:34 -0500)
Login processes can do another config lookup when TLS hostname is given.

--HG--
branch : HEAD

src/lib-master/master-service.c

index 1af3af0568d261b649fb612626be811b0a89c97a..16b2697784f81cecdb3f5d25ef622a9173e78112 100644 (file)
@@ -640,7 +640,6 @@ static void master_service_listen(struct master_service_listener *l)
 {
        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 master_service_listener *l)
        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)