From: Timo Sirainen Date: Thu, 12 Jan 2023 13:44:20 +0000 (+0200) Subject: global: Replace mail_debug checks with event_want_debug() X-Git-Tag: 2.4.0~2309 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73c3e62a4777eaa23f082889be5885cae92cfab3;p=thirdparty%2Fdovecot%2Fcore.git global: Replace mail_debug checks with event_want_debug() --- diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c index dc61c231dd..dbe3dd23e6 100644 --- a/src/imap-urlauth/imap-urlauth-worker.c +++ b/src/imap-urlauth/imap-urlauth-worker.c @@ -569,7 +569,7 @@ client_handle_user_command(struct client *client, const char *cmd, return 0; } - event_set_forced_debug(client->event, mail_user->mail_debug); + event_set_forced_debug(client->event, event_want_debug(mail_user->event)); /* drop privileges */ restrict_access_allow_coredumps(TRUE); diff --git a/src/lib-storage/index/pop3c/pop3c-storage.c b/src/lib-storage/index/pop3c/pop3c-storage.c index da13f880bb..f5ccdbed55 100644 --- a/src/lib-storage/index/pop3c/pop3c-storage.c +++ b/src/lib-storage/index/pop3c/pop3c-storage.c @@ -79,7 +79,7 @@ pop3c_client_create_from_set(struct mail_storage *storage, mail_user_set_get_temp_prefix(str, storage->user->set); client_set.temp_path_prefix = str_c(str); - client_set.debug = storage->user->mail_debug; + client_set.debug = event_want_debug(storage->event); client_set.rawlog_dir = mail_user_home_expand(storage->user, set->pop3c_rawlog_dir); diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c index e17f41c86e..426861245e 100644 --- a/src/lib-storage/mail-user.c +++ b/src/lib-storage/mail-user.c @@ -732,7 +732,7 @@ mail_user_try_load_class_plugin(struct mail_user *user, const char *name) mod_set.binary_name = master_service_get_name(master_service); mod_set.setting_name = ""; mod_set.require_init_funcs = TRUE; - mod_set.debug = user->mail_debug; + mod_set.debug = event_want_debug(user->event); mail_storage_service_modules = module_dir_load_missing(mail_storage_service_modules, @@ -815,7 +815,7 @@ void mail_user_init_fs_settings(struct mail_user *user, fs_set->session_id = user->session_id; fs_set->base_dir = user->set->base_dir; fs_set->temp_dir = user->set->mail_temp_dir; - fs_set->debug = user->mail_debug; + fs_set->debug = event_want_debug(user->event); fs_set->enable_timing = user->stats_enabled; fs_set->ssl_client_set = ssl_set_r; diff --git a/src/plugins/acl/acl-backend.c b/src/plugins/acl/acl-backend.c index 00feba0eb2..a5ecbe687e 100644 --- a/src/plugins/acl/acl-backend.c +++ b/src/plugins/acl/acl-backend.c @@ -61,7 +61,7 @@ acl_backend_init(const char *data, struct mailbox_list *list, backend->event = event_create(user->event); event_add_category(backend->event, &event_category_acl); - backend->debug = user->mail_debug; + backend->debug = event_want_debug(backend->event); backend->v = acl_backend_vfile; backend->list = list; backend->username = p_strdup(backend->pool, acl_username); diff --git a/src/plugins/fts/fts-parser-tika.c b/src/plugins/fts/fts-parser-tika.c index 610aa1bef1..594d7d7f88 100644 --- a/src/plugins/fts/fts-parser-tika.c +++ b/src/plugins/fts/fts-parser-tika.c @@ -77,7 +77,7 @@ tika_get_http_client_url(struct fts_parser_context *parser_context, struct http_ http_set.connect_timeout_msecs = 5*1000; http_set.request_timeout_msecs = 60*1000; http_set.ssl = &ssl_set; - http_set.debug = user->mail_debug; + http_set.debug = event_want_debug(user->event); http_set.event_parent = user->event; /* FIXME: We should initialize a shared client instead. However, diff --git a/src/plugins/push-notification/push-notification-driver-ox.c b/src/plugins/push-notification/push-notification-driver-ox.c index 4de7110037..bb99dbebe3 100644 --- a/src/plugins/push-notification/push-notification-driver-ox.c +++ b/src/plugins/push-notification/push-notification-driver-ox.c @@ -70,7 +70,7 @@ push_notification_driver_ox_init_global( unlikely to change between users so it shouldn't matter much. */ i_zero(&http_set); - http_set.debug = user->mail_debug; + http_set.debug = event_want_debug(user->event); http_set.max_attempts = config->http_max_retries+1; http_set.request_timeout_msecs = config->http_timeout_msecs; http_set.event_parent = user->event; diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c index 4450fa43fc..cc11e7e94d 100644 --- a/src/plugins/quota/quota.c +++ b/src/plugins/quota/quota.c @@ -306,7 +306,7 @@ int quota_user_read_settings(struct mail_user *user, quota_set->pool = pool; quota_set->event = event_create(user->event); quota_set->test_alloc = quota_default_test_alloc; - quota_set->debug = user->mail_debug; + quota_set->debug = event_want_debug(quota_set->event); quota_set->quota_exceeded_msg = mail_user_plugin_getenv(user, "quota_exceeded_message"); if (quota_set->quota_exceeded_msg == NULL) @@ -1043,7 +1043,7 @@ static void quota_warning_execute(struct quota_root *root, const char *cmd, struct program_client_settings set = { .client_connect_timeout_msecs = 1000, - .debug = root->quota->user->mail_debug, + .debug = event_want_debug(root->quota->event), }; struct program_client *pc; diff --git a/src/plugins/welcome/welcome-plugin.c b/src/plugins/welcome/welcome-plugin.c index 566f40c982..55bff47274 100644 --- a/src/plugins/welcome/welcome-plugin.c +++ b/src/plugins/welcome/welcome-plugin.c @@ -55,7 +55,7 @@ static void script_execute(struct mail_user *user, const char *cmd, bool wait) struct program_client_settings set = { .client_connect_timeout_msecs = 1000, .event = user->event, - .debug = user->mail_debug, + .debug = event_want_debug(user->event), .home = home, }; diff --git a/src/submission/submission-backend-relay.c b/src/submission/submission-backend-relay.c index b384c7dd58..2f08801a6e 100644 --- a/src/submission/submission-backend-relay.c +++ b/src/submission/submission-backend-relay.c @@ -49,8 +49,6 @@ backend_relay_handle_relay_reply(struct submission_backend_relay *rbackend, struct smtp_reply *reply_r) ATTR_NULL(2) { struct submission_backend *backend = &rbackend->backend; - struct client *client = rbackend->backend.client; - struct mail_user *user = client->user; const char *enh_code, *msg, *log_msg = NULL; const char *const *reply_lines; bool result = TRUE; @@ -1101,7 +1099,7 @@ submission_backend_relay_create( smtp_set.my_hostname = set->my_hostname; smtp_set.extra_capabilities = set->extra_capabilities; smtp_set.ssl = &ssl_set; - smtp_set.debug = user->mail_debug; + smtp_set.debug = event_want_debug(rbackend->backend.event); smtp_set.event_parent = rbackend->backend.event; if (set->rawlog_dir != NULL) { diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c index e3e5db3310..e4a9bf06fa 100644 --- a/src/submission/submission-client.c +++ b/src/submission/submission-client.c @@ -216,7 +216,7 @@ client_create(int fd_in, int fd_out, struct event *event, smtp_set.max_message_size = set->submission_max_mail_size; smtp_set.rawlog_dir = set->rawlog_dir; smtp_set.no_greeting = no_greeting; - smtp_set.debug = user->mail_debug; + smtp_set.debug = event_want_debug(client->event); smtp_set.event_parent = event; if ((workarounds & SUBMISSION_WORKAROUND_WHITESPACE_BEFORE_PATH) != 0) {