From: Timo Sirainen Date: Wed, 8 Mar 2023 14:50:29 +0000 (+0200) Subject: lib-master, lib-storage: Remove unused fields from master_service_settings_input X-Git-Tag: 2.4.0~2230 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=844003407fa22a746ed0c56123e90d72665b76dd;p=thirdparty%2Fdovecot%2Fcore.git lib-master, lib-storage: Remove unused fields from master_service_settings_input The username, local_ip and remote_ip are now looked up with the master_service_settings_get() calls rather than at this early stage. --- diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c index d724d530ed..bc31b79629 100644 --- a/src/lib-master/master-service-settings.c +++ b/src/lib-master/master-service-settings.c @@ -712,10 +712,6 @@ int master_service_settings_read(struct master_service *service, /* Create event for matching config filters */ struct event *event = event_create(NULL); event_add_str(event, "protocol", input->service); - event_add_str(event, "user", input->username); - event_add_str(event, "local_name", input->local_name); - event_add_ip(event, "local_ip", &input->local_ip); - event_add_ip(event, "remote_ip", &input->remote_ip); /* config_mmap is NULL only if MASTER_SERVICE_FLAG_NO_CONFIG_SETTINGS is used */ diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h index e2d9567d7b..5b4889bd9f 100644 --- a/src/lib-master/master-service-settings.h +++ b/src/lib-master/master-service-settings.h @@ -64,9 +64,6 @@ struct master_service_settings_input { bool disable_check_settings; const char *service; - const char *username; - struct ip_addr local_ip, remote_ip; - const char *local_name; }; struct master_service_settings_output { diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index 792c637039..f27ae9a6b6 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -925,12 +925,8 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx, set_input.use_sysexits = (flags & MAIL_STORAGE_SERVICE_FLAG_USE_SYSEXITS) != 0; - if (input != NULL) { + if (input != NULL) set_input.service = input->service; - set_input.username = input->username; - set_input.local_ip = input->local_ip; - set_input.remote_ip = input->remote_ip; - } if (ctx->settings_looked_up) { /* already looked up settings at least once. we really shouldn't be execing anymore. */