]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: LDAP request queue has no size limit anymore - remove dead code
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Thu, 5 Oct 2017 10:23:19 +0000 (13:23 +0300)
committerTimo Sirainen <tss@dovecot.fi>
Thu, 5 Oct 2017 11:31:38 +0000 (14:31 +0300)
src/auth/db-ldap.c

index 6a705408c8a24000fd677a12ff6d5907b3af3541..311d5f5c7836db9387e2dfa676c276fe146bf918 100644 (file)
@@ -425,8 +425,8 @@ static bool db_ldap_request_queue_next(struct ldap_connection *conn)
        }
 }
 
-static bool
-db_ldap_check_limits(struct ldap_connection *conn, struct ldap_request *request)
+static void
+db_ldap_check_hanging(struct ldap_connection *conn, struct ldap_request *request)
 {
        struct ldap_request *const *first_requestp;
        unsigned int count;
@@ -434,7 +434,7 @@ db_ldap_check_limits(struct ldap_connection *conn, struct ldap_request *request)
 
        count = aqueue_count(conn->request_queue);
        if (count == 0)
-               return TRUE;
+               return;
 
        first_requestp = array_idx(&conn->request_array,
                                   aqueue_idx(conn->request_queue, 0));
@@ -443,9 +443,7 @@ db_ldap_check_limits(struct ldap_connection *conn, struct ldap_request *request)
                auth_request_log_error(request->auth_request, AUTH_SUBSYS_DB,
                        "Connection appears to be hanging, reconnecting");
                ldap_conn_reconnect(conn);
-               return TRUE;
        }
-       return TRUE;
 }
 
 void db_ldap_request(struct ldap_connection *conn,
@@ -456,10 +454,7 @@ void db_ldap_request(struct ldap_connection *conn,
        request->msgid = -1;
        request->create_time = ioloop_time;
 
-       if (!db_ldap_check_limits(conn, request)) {
-               request->callback(conn, request, NULL);
-               return;
-       }
+       db_ldap_check_hanging(conn, request);
 
        aqueue_append(conn->request_queue, &request);
        (void)db_ldap_request_queue_next(conn);