From: Karl Fleischmann Date: Thu, 15 Feb 2024 15:44:43 +0000 (+0100) Subject: lib-imap-client: imapc-client - Remove debug setting X-Git-Tag: 2.4.1~825 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1773b2c61a4ba3f9a2163acbdd7a7c0c2095e6ac;p=thirdparty%2Fdovecot%2Fcore.git lib-imap-client: imapc-client - Remove debug setting The parent event's debug flag is sufficient. --- diff --git a/src/auth/passdb-imap.c b/src/auth/passdb-imap.c index 786453f23f..777e6510dc 100644 --- a/src/auth/passdb-imap.c +++ b/src/auth/passdb-imap.c @@ -91,7 +91,6 @@ passdb_imap_verify_plain(struct auth_request *auth_request, string_t *str; set = module->set; - set.debug = event_want_debug(auth_request->event); set.dns_client_socket_path = t_strconcat(auth_request->set->base_dir, "/", DNS_CLIENT_SOCKET_NAME, NULL); diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c index f4d9e58c49..74edb5e6c9 100644 --- a/src/lib-imap-client/imapc-client.c +++ b/src/lib-imap-client/imapc-client.c @@ -62,11 +62,9 @@ imapc_client_init(const struct imapc_client_settings *set, client->pool = pool; client->refcount = 1; client->event = event_create(event_parent); - event_set_forced_debug(client->event, set->debug); event_set_append_log_prefix(client->event, t_strdup_printf( "imapc(%s:%u): ", set->host, set->port)); - client->set.debug = set->debug; client->set.host = p_strdup(pool, set->host); client->set.port = set->port; client->set.master_user = p_strdup_empty(pool, set->master_user); diff --git a/src/lib-imap-client/imapc-client.h b/src/lib-imap-client/imapc-client.h index 7254480d8b..555c3abdb9 100644 --- a/src/lib-imap-client/imapc-client.h +++ b/src/lib-imap-client/imapc-client.h @@ -101,7 +101,6 @@ struct imapc_client_settings { bool ssl_allow_invalid_cert; const char *rawlog_dir; - bool debug; /* Timeout for logging in. 0 = default. */ unsigned int connect_timeout_msecs; diff --git a/src/lib-imap-client/test-imapc-client.c b/src/lib-imap-client/test-imapc-client.c index 349c03aa0c..813ea88c04 100644 --- a/src/lib-imap-client/test-imapc-client.c +++ b/src/lib-imap-client/test-imapc-client.c @@ -884,7 +884,6 @@ int main(int argc ATTR_UNUSED, char *argv[]) } test_subprocesses_init(debug); - test_imapc_default_settings.debug = debug; /* listen on localhost */ i_zero(&bind_ip); diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c index b8dc957cad..aefe3f4964 100644 --- a/src/lib-storage/index/imapc/imapc-storage.c +++ b/src/lib-storage/index/imapc/imapc-storage.c @@ -361,7 +361,6 @@ int imapc_storage_client_create(struct mailbox_list *list, set.dns_client_socket_path = *ns->user->set->base_dir == '\0' ? "" : t_strconcat(ns->user->set->base_dir, "/", DNS_CLIENT_SOCKET_NAME, NULL); - set.debug = event_want_debug(ns->user->event); set.rawlog_dir = mail_user_home_expand(ns->user, imapc_set->imapc_rawlog_dir); if ((imapc_set->parsed_features & IMAPC_FEATURE_SEND_ID) != 0)