]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveadm: server-connection - Remove redundant ssl verification
authorAki Tuomi <aki.tuomi@open-xchange.com>
Mon, 25 Feb 2019 14:40:46 +0000 (16:40 +0200)
committerVille Savolainen <ville.savolainen@dovecot.fi>
Thu, 21 Mar 2019 08:02:57 +0000 (10:02 +0200)
Certificate validation is done by lib-ssl-iostream already,
don't do it here again.

Fixes ssl_client_require_valid_cert=no for doveadm sync

src/doveadm/server-connection.c

index c1e7bb61b4bc4b6e3fb6a0d949637ddb12763c5b..168a38e868f6a26e3669deb061aaa4667394aa61 100644 (file)
@@ -488,19 +488,6 @@ static int server_connection_read_settings(struct server_connection *conn)
        return 0;
 }
 
-static int server_connection_ssl_handshaked(const char **error_r, void *context)
-{
-       struct server_connection *conn = context;
-
-       if (ssl_iostream_check_cert_validity(conn->ssl_iostream,
-                                            conn->server->hostname,
-                                            error_r) < 0)
-               return -1;
-       if (doveadm_debug)
-               i_debug("%s: SSL handshake successful", conn->server->name);
-       return 0;
-}
-
 static int server_connection_init_ssl(struct server_connection *conn)
 {
        struct ssl_iostream_settings ssl_set;
@@ -520,9 +507,6 @@ static int server_connection_init_ssl(struct server_connection *conn)
                i_error("Couldn't initialize SSL client: %s", error);
                return -1;
        }
-       ssl_iostream_set_handshake_callback(conn->ssl_iostream,
-                                           server_connection_ssl_handshaked,
-                                           conn);
        if (ssl_iostream_handshake(conn->ssl_iostream) < 0) {
                i_error("SSL handshake failed: %s",
                        ssl_iostream_get_last_error(conn->ssl_iostream));