]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
config: Remove handling for space-separated local_name in doveconf -f
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Tue, 4 Mar 2025 14:34:40 +0000 (16:34 +0200)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Thu, 6 Mar 2025 06:12:52 +0000 (06:12 +0000)
It's not supported anymore.

src/config/config-filter.c

index 48f2cd4c7491c2ce904b48d031306743c9906aad..e69a4e0208924689708d7d5dd902cfe6f25c400c 100644 (file)
@@ -33,22 +33,6 @@ static int config_filter_match_service(const struct config_filter *mask,
        return 1;
 }
 
-static bool
-config_filter_match_local_name(const struct config_filter *mask,
-                              const char *filter_local_name)
-{
-       /* Handle multiple names separated by spaces in local_name
-          * Ex: local_name "mail.domain.tld domain.tld mx.domain.tld" { ... } */
-       const char *ptr, *local_name = mask->local_name;
-       while((ptr = strchr(local_name, ' ')) != NULL) {
-               if (dns_match_wildcard(filter_local_name,
-                   t_strdup_until(local_name, ptr)) == 0)
-                       return TRUE;
-               local_name = ptr+1;
-       }
-       return dns_match_wildcard(filter_local_name, local_name) == 0;
-}
-
 static int config_filter_match_rest(const struct config_filter *mask,
                                    const struct config_filter *filter)
 {
@@ -60,7 +44,8 @@ static int config_filter_match_rest(const struct config_filter *mask,
                        ret = -1;
                else {
                        T_BEGIN {
-                               matched = config_filter_match_local_name(mask, filter->local_name);
+                               matched = dns_match_wildcard(filter->local_name,
+                                                            mask->local_name) == 0;
                        } T_END;
                        if (!matched)
                                return 0;