From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Fri, 23 Feb 2018 13:31:11 +0000 (+0200)
Subject: lib-master: Check local_name only if both filter and input have it
X-Git-Tag: 2.3.9~2178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05d2b80265123f48a8a0fec9c981de6e33ec0f2c;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Check local_name only if both filter and input have it

Broken in cedc777a1acf830af4cf0b6e9b0f343c81e20adc
---

diff --git a/src/lib-master/master-service-settings-cache.c b/src/lib-master/master-service-settings-cache.c
index 2bce353558..cbdff357b6 100644
--- a/src/lib-master/master-service-settings-cache.c
+++ b/src/lib-master/master-service-settings-cache.c
@@ -137,7 +137,7 @@ master_service_settings_cache_fix_input(struct master_service_settings_cache *ca
 		    net_is_in_network(&input->remote_ip, &filter->remote_ip,
 				      filter->remote_bits))
 			found_rip = TRUE;
-		if (filter->local_name != NULL &&
+		if (input->local_name != NULL && filter->local_name != NULL &&
 		    dns_match_wildcard(input->local_name, filter->local_name))
 			found_local_name = TRUE;
 		filter = filter->next;