From: Timo Sirainen Date: Thu, 23 Jan 2025 09:01:24 +0000 (+0200) Subject: global: Use settings_event_add_filter_name() where possible X-Git-Tag: 2.4.1~265 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54e4e3da4adb714786059c46352fba5368f7d4b7;p=thirdparty%2Fdovecot%2Fcore.git global: Use settings_event_add_filter_name() where possible --- diff --git a/src/auth/auth-policy.c b/src/auth/auth-policy.c index 02dabcc089..71523de4e0 100644 --- a/src/auth/auth-policy.c +++ b/src/auth/auth-policy.c @@ -145,7 +145,7 @@ void auth_policy_init(void) { const char *error; struct event *event = event_create(auth_event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "auth_policy"); + settings_event_add_filter_name(event, "auth_policy"); if (http_client_init_auto(event, &http_client, &error) < 0) i_fatal("%s", error); event_unref(&event); diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c index 9e9bc9c2ac..8414065b79 100644 --- a/src/auth/auth-request.c +++ b/src/auth/auth-request.c @@ -682,9 +682,8 @@ void auth_request_passdb_lookup_begin(struct auth_request *request) event_add_str(event, "passdb_id", dec2str(request->passdb->passdb->id)); const char *passdb_driver = request->passdb->passdb->iface.name; event_add_str(event, "passdb_driver", passdb_driver); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, - p_strconcat(event_get_pool(event), "passdb_", - passdb_driver, NULL)); + settings_event_add_filter_name(event, + t_strconcat("passdb_", passdb_driver, NULL)); event_set_log_prefix_callback(event, FALSE, auth_request_get_log_prefix_db, request); @@ -738,9 +737,8 @@ void auth_request_userdb_lookup_begin(struct auth_request *request) event_add_str(event, "userdb_id", dec2str(request->userdb->userdb->id)); const char *userdb_driver = request->userdb->userdb->iface->name; event_add_str(event, "userdb_driver", userdb_driver); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, - p_strconcat(event_get_pool(event), "userdb_", - userdb_driver, NULL)); + settings_event_add_filter_name(event, + t_strconcat("userdb_", userdb_driver, NULL)); event_set_log_prefix_callback(event, FALSE, auth_request_get_log_prefix_db, request); diff --git a/src/auth/auth.c b/src/auth/auth.c index a596f0e6d0..ac885eba07 100644 --- a/src/auth/auth.c +++ b/src/auth/auth.c @@ -84,9 +84,8 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *_set, struct event *event = event_create(auth_event); event_add_str(event, "protocol", auth->protocol); event_add_str(event, "passdb", _set->name); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, - p_strconcat(event_get_pool(event), "passdb_", - _set->driver, NULL)); + settings_event_add_filter_name(event, + t_strconcat("passdb_", _set->driver, NULL)); set = settings_get_or_fatal(event, &auth_passdb_setting_parser_info); auth_passdb = p_new(auth->pool, struct auth_passdb, 1); @@ -155,9 +154,8 @@ auth_userdb_preinit(struct auth *auth, const struct auth_userdb_settings *_set) struct event *event = event_create(auth_event); event_add_str(event, "protocol", auth->protocol); event_add_str(event, "userdb", _set->name); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, - p_strconcat(event_get_pool(event), "userdb_", - _set->driver, NULL)); + settings_event_add_filter_name(event, + t_strconcat("userdb_", _set->driver, NULL)); if (_set == &userdb_dummy_set) { /* If this is the dummy set do not try to lookup settings. */ set = _set; diff --git a/src/auth/db-oauth2.c b/src/auth/db-oauth2.c index 9093dac60b..61a1720e46 100644 --- a/src/auth/db-oauth2.c +++ b/src/auth/db-oauth2.c @@ -211,8 +211,7 @@ static int db_oauth2_setup(struct db_oauth2 *db, const char **error_r) if (strcmp(db->set->introspection_mode, "local") == 0) { struct event *event = event_create(db->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, - "oauth2_local_validation"); + settings_event_add_filter_name(event, "oauth2_local_validation"); int ret = dict_init_auto(event, &db->oauth2_set.key_dict, error_r); event_unref(&event); if (ret < 0) @@ -270,7 +269,7 @@ int db_oauth2_init(struct event *event, bool use_grant_password, struct db_oauth const struct auth_oauth2_settings *db_set; struct event *db_event = event_create(event); event_add_category(db_event, &event_category_oauth2); - event_set_ptr(db_event, SETTINGS_EVENT_FILTER_NAME, "oauth2"); + settings_event_add_filter_name(db_event, "oauth2"); if (settings_get(db_event, &auth_oauth2_setting_parser_info, 0, &db_set, error_r) < 0) { event_unref(&db_event); diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c index b114a5b5bf..ce244b2c42 100644 --- a/src/dict/dict-expire.c +++ b/src/dict/dict-expire.c @@ -104,7 +104,7 @@ static void main_init(void) struct event *event = master_service_get_event(master_service); event_add_category(event, &dict_server_event_category); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "dict_server"); + settings_event_add_filter_name(event, "dict_server"); server_settings = settings_get_or_fatal(event, &dict_server_setting_parser_info); dict_settings = diff --git a/src/dict/main.c b/src/dict/main.c index 9b3637c961..d0be635ab9 100644 --- a/src/dict/main.c +++ b/src/dict/main.c @@ -104,7 +104,7 @@ static void main_init(void) struct module_dir_load_settings mod_set; event_add_category(event, &dict_server_event_category); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "dict_server"); + settings_event_add_filter_name(event, "dict_server"); server_settings = settings_get_or_fatal(event, &dict_server_setting_parser_info); dict_settings = diff --git a/src/doveadm/client-connection-tcp.c b/src/doveadm/client-connection-tcp.c index 25d7db9ef5..9299596f29 100644 --- a/src/doveadm/client-connection-tcp.c +++ b/src/doveadm/client-connection-tcp.c @@ -582,8 +582,7 @@ client_connection_tcp_create(int fd, int listen_fd, bool ssl) pool = pool_alloconly_create("doveadm client", 1024*16); conn = p_new(pool, struct client_connection_tcp, 1); conn->conn.event = event_create(NULL); - event_set_ptr(conn->conn.event, SETTINGS_EVENT_FILTER_NAME, - DOVEADM_SERVER_FILTER); + settings_event_add_filter_name(conn->conn.event, DOVEADM_SERVER_FILTER); event_set_append_log_prefix(conn->conn.event, "tcp: "); conn->fd = fd; diff --git a/src/doveadm/doveadm-dict.c b/src/doveadm/doveadm-dict.c index 472b801247..7cd1c8088a 100644 --- a/src/doveadm/doveadm-dict.c +++ b/src/doveadm/doveadm-dict.c @@ -53,8 +53,7 @@ cmd_dict_init(struct doveadm_cmd_context *cctx, dict_drivers_register_builtin(); - event_set_ptr(cctx->event, SETTINGS_EVENT_FILTER_NAME, - t_strdup_noconst(filter_name)); + settings_event_add_filter_name(cctx->event, filter_name); if (dict_init_auto(cctx->event, &dict, &error) <= 0) { e_error(cctx->event, "dict_init() failed: %s", error); diff --git a/src/doveadm/doveadm-fs.c b/src/doveadm/doveadm-fs.c index c816580c9d..83e93f4b36 100644 --- a/src/doveadm/doveadm-fs.c +++ b/src/doveadm/doveadm-fs.c @@ -34,8 +34,7 @@ static struct fs *doveadm_fs_init(struct doveadm_cmd_context *cctx) fs_param.temp_dir = doveadm_settings->mail_temp_dir; fs_param.base_dir = doveadm_settings->base_dir; - event_set_ptr(cctx->set_event, SETTINGS_EVENT_FILTER_NAME, - t_strdup_noconst(filter_name)); + settings_event_add_filter_name(cctx->set_event, filter_name); if (fs_init_auto(cctx->set_event, &fs_param, &fs, &error) <= 0) i_fatal("fs_init() failed: %s", error); event_set_ptr(cctx->set_event, SETTINGS_EVENT_FILTER_NAME, NULL); diff --git a/src/doveadm/main.c b/src/doveadm/main.c index bac236ddce..fe3e885501 100644 --- a/src/doveadm/main.c +++ b/src/doveadm/main.c @@ -71,7 +71,7 @@ static void doveadm_http_server_init(void) struct event *event = event_create(master_service_get_event(master_service)); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, DOVEADM_SERVER_FILTER); + settings_event_add_filter_name(event, DOVEADM_SERVER_FILTER); if (http_server_init_auto(event, &doveadm_http_server, &error) < 0) i_fatal("http_server_init() failed: %s", error); event_unref(&event); diff --git a/src/lib-fs/fs-dict.c b/src/lib-fs/fs-dict.c index f29696ec9d..10035f8eac 100644 --- a/src/lib-fs/fs-dict.c +++ b/src/lib-fs/fs-dict.c @@ -109,7 +109,7 @@ fs_dict_init(struct fs *_fs, const struct fs_parameters *params ATTR_UNUSED, return -1; struct event *event = event_create(_fs->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "fs_dict"); + settings_event_add_filter_name(event, "fs_dict"); ret = dict_init_auto(event, &fs->dict, error_r); event_unref(&event); if (ret == 0) diff --git a/src/lib-ssl-iostream/ssl-settings.c b/src/lib-ssl-iostream/ssl-settings.c index b37384cf87..deb30942e8 100644 --- a/src/lib-ssl-iostream/ssl-settings.c +++ b/src/lib-ssl-iostream/ssl-settings.c @@ -180,7 +180,7 @@ int ssl_client_settings_get(struct event *event, const char **error_r) { event = event_create(event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "ssl_client"); + settings_event_add_filter_name(event, "ssl_client"); int ret = settings_get(event, &ssl_setting_parser_info, 0, set_r, error_r); event_unref(&event); @@ -193,7 +193,7 @@ int ssl_server_settings_get(struct event *event, const char **error_r) { event = event_create(event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "ssl_server"); + settings_event_add_filter_name(event, "ssl_server"); int ret = settings_get(event, &ssl_setting_parser_info, 0, set_r, error_r); if (ret == 0) { diff --git a/src/lib-storage/index/dbox-common/dbox-storage.c b/src/lib-storage/index/dbox-common/dbox-storage.c index 87b065a8c3..50f2450fee 100644 --- a/src/lib-storage/index/dbox-common/dbox-storage.c +++ b/src/lib-storage/index/dbox-common/dbox-storage.c @@ -103,8 +103,7 @@ int dbox_storage_create(struct mail_storage *_storage, storage->attachment_dir = p_strdup(_storage->pool, dir); struct event *event = event_create(_storage->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, - "mail_ext_attachment"); + settings_event_add_filter_name(event, "mail_ext_attachment"); ret = mailbox_list_init_fs(ns->list, event, storage->attachment_dir, &storage->attachment_fs, &error); diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c index 0cee72e36b..9f4fe9919d 100644 --- a/src/lib-storage/index/imapc/imapc-list.c +++ b/src/lib-storage/index/imapc/imapc-list.c @@ -465,8 +465,8 @@ static struct mailbox_list *imapc_list_get_fs(struct imapc_mailbox_list *list) struct event *event = event_create(list->list.event); event_set_ptr(event, SETTINGS_EVENT_INSTANCE, list->index_list_set_instance); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, - MAILBOX_LIST_NAME_MAILDIRPLUSPLUS); + settings_event_add_filter_name(event, + MAILBOX_LIST_NAME_MAILDIRPLUSPLUS); if (settings_get(event, &mail_storage_setting_parser_info, 0, &mail_set, &error) < 0) { e_error(list->list.event, "%s", error); diff --git a/src/lib-storage/index/index-attribute.c b/src/lib-storage/index/index-attribute.c index 2ed67c186d..491b7794b6 100644 --- a/src/lib-storage/index/index-attribute.c +++ b/src/lib-storage/index/index-attribute.c @@ -56,8 +56,7 @@ index_storage_get_user_dict(struct mail_storage *err_storage, } struct event *event = event_create(user->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, - "mail_attribute"); + settings_event_add_filter_name(event, "mail_attribute"); ret = dict_init_auto(event, &user->_attr_dict, &error); event_unref(&event); @@ -127,7 +126,7 @@ index_storage_get_dict(struct mailbox *box, enum mail_attribute_type type_flags, } struct event *event = event_create(storage->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "mail_attribute"); + settings_event_add_filter_name(event, "mail_attribute"); ret = dict_init_auto(event, &storage->_shared_attr_dict, &error); event_unref(&event); diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c index ddf3fbd99b..37a66a0786 100644 --- a/src/lib-storage/mail-storage.c +++ b/src/lib-storage/mail-storage.c @@ -332,8 +332,7 @@ mail_storage_create_list(struct mail_namespace *ns, struct event *set_event = event_create(parent_set_event); /* Lookup storage-specific settings, especially to get storage-specific defaults for mailbox list settings. */ - event_set_ptr(set_event, SETTINGS_EVENT_FILTER_NAME, - (void *)storage_class->name); + settings_event_add_filter_name(set_event, storage_class->name); /* Set namespace, but don't overwrite if it already is set. Shared storage uses the same shared namespace here also for the user's root prefix="" namespace. */ @@ -358,10 +357,8 @@ mail_storage_create_list(struct mail_namespace *ns, struct event *set_event2 = event_create(set_event); event_unref(&set_event); set_event = set_event2; - char *layout_filter = - p_strdup_printf(event_get_pool(set_event), "layout_%s", - t_str_lcase(mail_set->mailbox_list_layout)); - event_set_ptr(set_event, SETTINGS_EVENT_FILTER_NAME, layout_filter); + settings_event_add_filter_name(set_event, t_strdup_printf("layout_%s", + t_str_lcase(mail_set->mailbox_list_layout))); settings_free(mail_set); if (root_path_override != NULL) { diff --git a/src/lib-storage/mailbox-attribute.c b/src/lib-storage/mailbox-attribute.c index 8d7a6322af..67845ee121 100644 --- a/src/lib-storage/mailbox-attribute.c +++ b/src/lib-storage/mailbox-attribute.c @@ -480,7 +480,7 @@ int mailbox_attribute_dict_is_enabled(struct mail_user *user, { struct dict_settings *dict_set; struct event *event = event_create(user->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "mail_attribute"); + settings_event_add_filter_name(event, "mail_attribute"); int ret = settings_get(event, &dict_setting_parser_info, 0, &dict_set, error_r); if (ret == 0 && array_not_empty(&dict_set->dicts)) diff --git a/src/plugins/acl/acl-lookup-dict.c b/src/plugins/acl/acl-lookup-dict.c index 1ad95d576b..fd09542389 100644 --- a/src/plugins/acl/acl-lookup-dict.c +++ b/src/plugins/acl/acl-lookup-dict.c @@ -47,8 +47,7 @@ int acl_lookup_dict_init(struct mail_user *user, struct acl_lookup_dict **dict_r event_add_category(dict->event, &event_category_acl); event_set_append_log_prefix(dict->event, "acl: "); - event_set_ptr(dict->event, SETTINGS_EVENT_FILTER_NAME, - "acl_sharing_map"); + settings_event_add_filter_name(dict->event, "acl_sharing_map"); return dict_init_auto(dict->event, &dict->dict, error_r); } diff --git a/src/plugins/fts-solr/solr-connection.c b/src/plugins/fts-solr/solr-connection.c index 5d21863bd0..12567938ab 100644 --- a/src/plugins/fts-solr/solr-connection.c +++ b/src/plugins/fts-solr/solr-connection.c @@ -100,7 +100,7 @@ int solr_connection_init(const struct fts_solr_settings *solr_set, Using a private client will provide a quick fix for now. */ - event_set_ptr(conn->event, SETTINGS_EVENT_FILTER_NAME, FTS_SOLR_FILTER); + settings_event_add_filter_name(conn->event, FTS_SOLR_FILTER); if (http_client_init_private_auto(conn->event, &solr_http_client, &error) < 0) { *error_r = t_strdup(error); diff --git a/src/plugins/fts/fts-parser-tika.c b/src/plugins/fts/fts-parser-tika.c index d89efb276f..119859f0ef 100644 --- a/src/plugins/fts/fts-parser-tika.c +++ b/src/plugins/fts/fts-parser-tika.c @@ -74,9 +74,9 @@ tika_get_http_client_url(struct fts_parser_context *parser_context, struct http_ now. */ struct event *event_fts = event_create(user->event); - event_set_ptr(event_fts, SETTINGS_EVENT_FILTER_NAME, FTS_FILTER); + settings_event_add_filter_name(event_fts, FTS_FILTER); struct event *event_tika = event_create(event_fts); - event_set_ptr(event_tika, SETTINGS_EVENT_FILTER_NAME, FTS_FILTER_DECODER_TIKA); + settings_event_add_filter_name(event_tika, FTS_FILTER_DECODER_TIKA); int ret = http_client_init_private_auto(event, &tika_http_client, &error); event_unref(&event_tika); event_unref(&event_fts); diff --git a/src/plugins/last-login/last-login-plugin.c b/src/plugins/last-login/last-login-plugin.c index 906fdfe920..bdb1dbf669 100644 --- a/src/plugins/last-login/last-login-plugin.c +++ b/src/plugins/last-login/last-login-plugin.c @@ -125,7 +125,7 @@ static void last_login_mail_user_created(struct mail_user *user) } struct event *event = event_create(user->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "last_login"); + settings_event_add_filter_name(event, "last_login"); event_set_append_log_prefix(event, "last_login_dict: "); if (settings_get(event, &last_login_setting_parser_info, 0, &set, &error) < 0) { diff --git a/src/plugins/mail-lua/mail-lua-plugin.c b/src/plugins/mail-lua/mail-lua-plugin.c index 9f10e2ad45..60b07d2c32 100644 --- a/src/plugins/mail-lua/mail-lua-plugin.c +++ b/src/plugins/mail-lua/mail-lua-plugin.c @@ -102,7 +102,7 @@ static void mail_lua_user_created(struct mail_user *user) int ret; event = event_create(user->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, MAIL_LUA_FILTER); + settings_event_add_filter_name(event, MAIL_LUA_FILTER); if ((ret = dlua_script_create_auto(event, &script, &error)) < 0) { user->error = p_strdup_printf(user->pool, "dlua_script_create_auto() failed: %s", diff --git a/src/plugins/notify-status/notify-status-plugin.c b/src/plugins/notify-status/notify-status-plugin.c index 5a955db39c..1c58a27902 100644 --- a/src/plugins/notify-status/notify-status-plugin.c +++ b/src/plugins/notify-status/notify-status-plugin.c @@ -319,7 +319,7 @@ static void notify_status_mail_user_created(struct mail_user *user) } struct event *event = event_create(user->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "notify_status"); + settings_event_add_filter_name(event, "notify_status"); int ret = dict_init_auto(event, &dict, &error); event_unref(&event); diff --git a/src/plugins/quota-clone/quota-clone-plugin.c b/src/plugins/quota-clone/quota-clone-plugin.c index dfbbdcd88f..cb6804deff 100644 --- a/src/plugins/quota-clone/quota-clone-plugin.c +++ b/src/plugins/quota-clone/quota-clone-plugin.c @@ -278,7 +278,7 @@ static void quota_clone_mail_user_created(struct mail_user *user) struct quota_clone_settings *set; struct event *event = event_create(user->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "quota_clone"); + settings_event_add_filter_name(event, "quota_clone"); if (settings_get(event, "a_clone_setting_parser_info, 0, &set, &error) < 0) { user->error = p_strdup(user->pool, error); diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c index 81b10f50eb..a60560d837 100644 --- a/src/plugins/quota/quota.c +++ b/src/plugins/quota/quota.c @@ -222,14 +222,12 @@ quota_root_init(struct quota *quota, struct event *set_event, const char *root_n event_set_append_log_prefix(root->backend.event, t_strdup_printf("quota-%s: ", root->backend.name)); event_add_str(root->backend.event, "quota", root_name); - event_set_ptr(root->backend.event, SETTINGS_EVENT_FILTER_NAME, - p_strdup(event_get_pool(root->backend.event), backend_filter)); + settings_event_add_filter_name(root->backend.event, backend_filter); event_drop_parent_log_prefixes(root->backend.event, 1); /* Lookup settings again with quota_backend filter name */ set_event = event_create(set_event); - event_set_ptr(set_event, SETTINGS_EVENT_FILTER_NAME, - p_strdup(event_get_pool(set_event), backend_filter)); + settings_event_add_filter_name(set_event, backend_filter); if (settings_get_filter(set_event, "quota", root_name, "a_root_setting_parser_info, 0, &root->set, error_r) < 0) { @@ -1055,8 +1053,7 @@ static void quota_over_status_check_root(struct quota_root *root) cur_overquota ? 1 : 0); if (cur_overquota != quota_over_status) { struct event *event = event_create(root->backend.event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, - "quota_over_status"); + settings_event_add_filter_name(event, "quota_over_status"); event_set_append_log_prefix(event, "quota_over_status: "); quota_warning_execute(event, root->set->quota_over_status_current, diff --git a/src/plugins/welcome/welcome-plugin.c b/src/plugins/welcome/welcome-plugin.c index f9c4f6e37a..d01e7d5008 100644 --- a/src/plugins/welcome/welcome-plugin.c +++ b/src/plugins/welcome/welcome-plugin.c @@ -114,7 +114,7 @@ welcome_create_box(struct mailbox *box, const struct welcome_settings *set = NULL; const char *error; struct event *event = event_create(box->storage->user->event); - event_set_ptr(event, SETTINGS_EVENT_FILTER_NAME, "welcome"); + settings_event_add_filter_name(event, "welcome"); event_set_append_log_prefix(event, "welcome: "); if (settings_get(event, &welcome_setting_parser_info, 0, &set, &error) < 0 || diff --git a/src/stats/client-http.c b/src/stats/client-http.c index add8d6ade4..18cb4dcc66 100644 --- a/src/stats/client-http.c +++ b/src/stats/client-http.c @@ -220,7 +220,7 @@ void client_http_init(struct event *parent_event) i_array_init(&stats_http_resources, 8); struct event *event = event_create(parent_event); - event_set_ptr(parent_event, SETTINGS_EVENT_FILTER_NAME, STATS_SERVER_FILTER); + settings_event_add_filter_name(parent_event, STATS_SERVER_FILTER); if (http_server_init_auto(event, &stats_http_server, &error) < 0) i_fatal("http_server_init() failed: %s", error); stats_http_resource_add("/", NULL,