mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-23 16:20:25 +01:00
1cba0a3cca
According to the documentation, settings from [global-dns] (searches and options) are always merged with those from connections. However this was not happening if no [global-dns-domain-*] exists, in which case connections were ignored. This happened because in the past both global sections must de defined or undefined. When this was changed to allow defining only [global-dns], allowing it in the function that generates the resolv.conf file was forgotten. Fix that now. Anyway, merging these configs doesn't make much sense. The searches and options defined in connections probably make sense only for the nameservers defined in that same connection. Because of this, make the following change: if global nameservers are defined, use searches and options from [global-dns] only, because those defined in connections may not make sense for the global nameservers. If [global-dns] is missing, assume an empty [global-dns] section. Also, if no global nameservers are defined, but [global-dns] is, make that it overwrites the searches and options defined in connections. This is not ideal, but none of the alternatives is better and at least this is easy to remember. So, the resulting rules from above are: - If [global-dns] is defined, it always overwrite searches and options from connections. - If [global-dns-domain-*] is defined, it always overwrite nameservers from connections. It overwrites searches and options too. Fixes: |
||
|---|---|---|
| .. | ||
| nm-dns-dnsconfd.c | ||
| nm-dns-dnsconfd.h | ||
| nm-dns-dnsmasq.c | ||
| nm-dns-dnsmasq.h | ||
| nm-dns-manager.c | ||
| nm-dns-manager.h | ||
| nm-dns-plugin.c | ||
| nm-dns-plugin.h | ||
| nm-dns-systemd-resolved.c | ||
| nm-dns-systemd-resolved.h | ||