imapc: max_idle_time setting didn't actually work.

diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c
index 267157aebf714c85af7d2c773625342f2e11d1ff..e94d689b636b8fc1f03202a0c8c2a291e2e5dc86 100644 (file)
--- a/src/lib-imap-client/imapc-client.c
+++ b/src/lib-imap-client/imapc-client.c
@@ -57,6 +57,7 @@ imapc_client_init(const struct imapc_client_settings *set)
        client->set.temp_path_prefix =
                p_strdup(pool, set->temp_path_prefix);
        client->set.rawlog_dir = p_strdup(pool, set->rawlog_dir);
+       client->set.max_idle_time = set->max_idle_time;
 
        if (set->ssl_mode != IMAPC_CLIENT_SSL_MODE_NONE) {
                client->set.ssl_mode = set->ssl_mode;

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index 153ea7b3ba36bbec71fb920d82fd551f190904d4..9fcacc9849ecc7429b670994eca9219c33f87bc5 100644 (file)
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -1280,6 +1280,8 @@ static void imapc_connection_connect_next_ip(struct imapc_connection *conn)
        struct stat st;
        int fd;
 
+       i_assert(conn->client->set.max_idle_time > 0);
+
        conn->prev_connect_idx = (conn->prev_connect_idx+1) % conn->ips_count;
        ip = &conn->ips[conn->prev_connect_idx];
        fd = net_connect_ip(ip, conn->client->set.port, NULL);