From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 29 Nov 2022 22:54:18 +0000 (+0200)
Subject: lib-master, config: Remove unused flags in master_service_settings_output
X-Git-Tag: 2.4.0~3079
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d70cdb6ce07d460cc7afa824649e43f57e4ecd87;p=thirdparty%2Fdovecot%2Fcore.git

lib-master, config: Remove unused flags in master_service_settings_output
---

diff --git a/src/config/config-filter.c b/src/config/config-filter.c
index 981e68d736..edbd0459f3 100644
--- a/src/config/config-filter.c
+++ b/src/config/config-filter.c
@@ -231,17 +231,8 @@ config_filter_find_all(struct config_filter_context *ctx, pool_t pool,
 			continue;
 		}
 
-		if (mask->local_bits > 0 || mask->local_name != NULL)
-			output_r->service_uses_local = TRUE;
-		if (mask->remote_bits > 0)
-			output_r->service_uses_remote = TRUE;
-		if (config_filter_match_rest(mask, filter)) {
-			if (mask->local_bits > 0 || mask->local_name != NULL)
-				output_r->used_local = TRUE;
-			if (mask->remote_bits > 0)
-				output_r->used_remote = TRUE;
+		if (config_filter_match_rest(mask, filter))
 			array_push_back(&matches, &ctx->parsers[i]);
-		}
 	}
 	if (filter->service == NULL) {
 		array_append_zero(&service_names);
diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index 58ff069c8e..75d32e8dd1 100644
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -63,15 +63,6 @@ struct master_service_settings_output {
 	   that have more specific settings */
 	const char *const *specific_services;
 
-	/* some settings for this service (or if service was not given,
-	   all services) contain local/remote ip/host specific settings
-	   (but this lookup didn't necessarily return any of them). */
-	bool service_uses_local:1;
-	bool service_uses_remote:1;
-	/* returned settings contain settings specific to given
-	   local/remote ip/host */
-	bool used_local:1;
-	bool used_remote:1;
 	/* Config couldn't be read because we don't have enough permissions.
 	   The process probably should be restarted and the settings read
 	   before dropping privileges. */