lib-ssl-iostream, global: Remove ssl_iostream_settings.verbose

This was unnecessary, because all the callers already set the parent event
to debug log level.

diff --git a/src/auth/db-oauth2.c b/src/auth/db-oauth2.c
index b0420b3415ebe5144e3090726a32f29d8cf5023b..2789d97485f82b693beb623cf698d24f7444e621 100644 (file)
--- a/src/auth/db-oauth2.c
+++ b/src/auth/db-oauth2.c
@@ -228,7 +228,6 @@ struct db_oauth2 *db_oauth2_init(const char *config_path)
        }
        ssl_set.prefer_server_ciphers = TRUE;
        ssl_set.allow_invalid_cert = db->set.tls_allow_invalid_cert;
-       ssl_set.verbose = db->set.debug;
        http_set.ssl = &ssl_set;
 
        http_set.dns_client_socket_path = "dns-client";

diff --git a/src/doveadm/doveadm-fs.c b/src/doveadm/doveadm-fs.c
index ed0cba49ab2395a2ea22b84c0690aaca516e6579..fdd2b62e4a253aa6adba668608b037ff29450ccc 100644 (file)
--- a/src/doveadm/doveadm-fs.c
+++ b/src/doveadm/doveadm-fs.c
@@ -32,7 +32,6 @@ cmd_fs_init(struct doveadm_cmd_context *cctx)
                fs_cmd_help(cctx);
 
        doveadm_get_ssl_settings(&ssl_set, pool_datastack_create());
-       ssl_set.verbose = doveadm_debug;
        i_zero(&fs_set);
        fs_set.ssl_client_set = &ssl_set;
        fs_set.temp_dir = doveadm_settings->mail_temp_dir;

diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index 43a0e0e44d399405a2ab773e701b9aed112edc4c..fa63c200fb9c4df49e0b2bbd2c7584c38c0dacec 100644 (file)
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -1883,9 +1883,7 @@ test_run_sequential(
 
        /* ssl settings */
        ssl_iostream_test_settings_server(&ssl_server_set);
-       ssl_server_set.verbose = debug;
        ssl_iostream_test_settings_client(&ssl_client_set);
-       ssl_client_set.verbose = debug;
 
        /* server settings */
        test_init_server_settings(&http_server_set);
@@ -1915,9 +1913,7 @@ test_run_pipeline(
 
        /* ssl settings */
        ssl_iostream_test_settings_server(&ssl_server_set);
-       ssl_server_set.verbose = debug;
        ssl_iostream_test_settings_client(&ssl_client_set);
-       ssl_client_set.verbose = debug;
 
        /* server settings */
        test_init_server_settings(&http_server_set);
@@ -1947,9 +1943,7 @@ test_run_parallel(
 
        /* ssl settings */
        ssl_iostream_test_settings_server(&ssl_server_set);
-       ssl_server_set.verbose = debug;
        ssl_iostream_test_settings_client(&ssl_client_set);
-       ssl_client_set.verbose = debug;
 
        /* server settings */
        test_init_server_settings(&http_server_set);

diff --git a/src/lib-lua/test-lua-http-client.c b/src/lib-lua/test-lua-http-client.c
index f75324f0bb18be532d41e3f140155c673b478465..c75938a4d85f3efdc18e1de57d3fb0cd348524f4 100644 (file)
--- a/src/lib-lua/test-lua-http-client.c
+++ b/src/lib-lua/test-lua-http-client.c
@@ -465,7 +465,6 @@ server_connection_init_ssl(struct server_connection *conn)
        connection_input_halt(&conn->conn);
 
        ssl_iostream_test_settings_server(&ssl_set);
-       ssl_set.verbose = debug;
 
        if (server_ssl_ctx == NULL &&
            ssl_iostream_context_init_server(&ssl_set, &server_ssl_ctx,

diff --git a/src/lib-smtp/test-smtp-client-errors.c b/src/lib-smtp/test-smtp-client-errors.c
index c7abb447da782790e2ef0a32e853f0d58ee90ab4..41710ed88f958df243bf429ff2ec74ba241a9dcd 100644 (file)
--- a/src/lib-smtp/test-smtp-client-errors.c
+++ b/src/lib-smtp/test-smtp-client-errors.c
@@ -3827,7 +3827,6 @@ static void test_invalid_ssl_certificate(void)
 
        /* ssl settings */
        ssl_iostream_test_settings_client(&ssl_set);
-       ssl_set.verbose = debug;
 
        test_client_defaults(&smtp_client_set);
        smtp_client_set.dns_client_socket_path = "./dns-test";
@@ -3941,7 +3940,6 @@ server_connection_init_ssl(struct server_connection *conn)
        connection_input_halt(&conn->conn);
 
        ssl_iostream_test_settings_server(&ssl_set);
-       ssl_set.verbose = debug;
 
        if (server_ssl_ctx == NULL &&
            ssl_iostream_context_init_server(&ssl_set, &server_ssl_ctx,

diff --git a/src/lib-smtp/test-smtp-payload.c b/src/lib-smtp/test-smtp-payload.c
index 277d260021bc69d9cd466d00ee4590d0c94ec75e..1ae5b685abf952e9fd301c8e554d76215ea4873b 100644 (file)
--- a/src/lib-smtp/test-smtp-payload.c
+++ b/src/lib-smtp/test-smtp-payload.c
@@ -958,9 +958,7 @@ test_run_scenarios(
 
        /* ssl settings */
        ssl_iostream_test_settings_server(&ssl_server_set);
-       ssl_server_set.verbose = debug;
        ssl_iostream_test_settings_client(&ssl_client_set);
-       ssl_client_set.verbose = debug;
 
        /* server settings */
        i_zero(&smtp_server_set);

diff --git a/src/lib-ssl-iostream/iostream-openssl.c b/src/lib-ssl-iostream/iostream-openssl.c
index 9fd7f76f410e4742010064fc762ef9350563e149..c84206e9ded52f73dbe99903cad3f23476c0c63e 100644 (file)
--- a/src/lib-ssl-iostream/iostream-openssl.c
+++ b/src/lib-ssl-iostream/iostream-openssl.c
@@ -125,10 +125,6 @@ openssl_iostream_set(struct ssl_iostream *ssl_io,
                               openssl_iostream_verify_client_cert);
        }
 
-       if (set->verbose)
-               event_set_forced_debug(ssl_io->event, TRUE);
-       else
-               event_set_min_log_level(ssl_io->event, LOG_TYPE_WARNING);
        ssl_io->allow_invalid_cert = set->allow_invalid_cert;
 }
 

diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c
index e59f71a488b1b6844f2f727a328784a7a1bf79c4..c95c758e41da1c77423c494da2d2492dff6bb75b 100644 (file)
--- a/src/lib-ssl-iostream/iostream-ssl.c
+++ b/src/lib-ssl-iostream/iostream-ssl.c
@@ -321,7 +321,6 @@ bool ssl_iostream_settings_equals(const struct ssl_iostream_settings *set1,
 
 void ssl_iostream_settings_drop_stream_only(struct ssl_iostream_settings *set)
 {
-       set->verbose = FALSE;
        set->allow_invalid_cert = FALSE;
 }
 

diff --git a/src/lib-ssl-iostream/iostream-ssl.h b/src/lib-ssl-iostream/iostream-ssl.h
index 3221e40c4b0697243f3de9f286af6904031253b9..015a9c674e41eb0051a7008c5816e2afd31722e5 100644 (file)
--- a/src/lib-ssl-iostream/iostream-ssl.h
+++ b/src/lib-ssl-iostream/iostream-ssl.h
@@ -27,7 +27,6 @@ struct ssl_iostream_settings {
        const char *cert_username_field; /* context-only */
        const char *crypto_device; /* context-only */
 
-       bool verbose; /* stream-only */
        bool skip_crl_check; /* context-only */
        bool verify_remote_cert; /* context-only */
        bool allow_invalid_cert; /* stream-only */