colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: branch 'bg/dnsmasq-global-conf'

Browse Source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1555
This commit is contained in:
Beniamino Galvani
2023-03-03 14:53:29 +01:00
parent 713de313dc f57a848da5
commit 06219dbcf9
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
man/NetworkManager.conf.xml
View File

@@ -1453,8 +1453,8 @@ managed=1
<refsect1> <refsect1>
<title><literal>global-dns</literal> section</title> <title><literal>global-dns</literal> section</title>
<para>This section specifies global DNS settings that override <para>This section specifies DNS settings that are applied
connection-specific configuration.</para> globally, in addition to connection-specific ones.</para>
<para> <para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
@@ -1482,10 +1482,15 @@ managed=1
<para>Sections with a name starting with the "global-dns-domain-" <para>Sections with a name starting with the "global-dns-domain-"
prefix allow to define global DNS configuration for specific prefix allow to define global DNS configuration for specific
domains. The part of section name after "global-dns-domain-" domains. The part of section name after "global-dns-domain-"
specifies the domain name a section applies to. More specific specifies the domain name a section applies to (for example, a
domains have the precedence over less specific ones and the section could be named "global-dns-domain-foobar.com"). More
default domain is represented by the wildcard "*". A default specific domains have the precedence over less specific ones and
domain section is mandatory. the default domain is represented by the wildcard "*".
To be valid, global DNS domains must include a section for the
default domain "*". When the global DNS domains are valid, the
name servers and domains defined globally override the ones from
active connections.
</para> </para>
<para> <para>
<variablelist> <variablelist>

3
src/core/dns/nm-dns-dnsmasq.c
View File

@@ -922,7 +922,8 @@ create_update_args(NMDnsDnsmasq *self,
if (global_config) if (global_config)
add_global_config(self, &servers, global_config); add_global_config(self, &servers, global_config);
else {
if (!global_config || !nm_global_dns_config_lookup_domain(global_config, "*")) {
c_list_for_each_entry (ip_data, ip_data_lst_head, ip_data_lst) c_list_for_each_entry (ip_data, ip_data_lst_head, ip_data_lst)
add_ip_config(self, &servers, ip_data); add_ip_config(self, &servers, ip_data);
} }