summaryrefslogtreecommitdiff
path: root/man/NetworkManager.conf.xml
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-12-20 14:49:32 +0100
committerThomas Haller <thaller@redhat.com>2018-01-09 14:24:54 +0100
commitc03a5349638ac0fa911d5f7116e6f7c52d11b931 (patch)
tree4c41c8a2c177b342d7e1bec25f194fcaba26ca0d /man/NetworkManager.conf.xml
parentb40729ca5f72a147872c4d38b2de6b5fb757f5b4 (diff)
downloadNetworkManager-c03a5349638ac0fa911d5f7116e6f7c52d11b931.tar.gz
core: implement setting MDNS setting for systemd
The connection.mdns setting is a per-connection setting, so one might expect that one activated device can only have one MDNS setting at a time. However, with certain VPN plugins (those that don't have their own IP interface, like libreswan), the VPN configuration is merged into the configuration of the device. So, in this case, there might be multiple settings for one device that must be merged. We already have a mechanism for that. It's NMIP4Config. Let NMIP4Config track this piece of information. Although, stricitly speaking this is not tied to IPv4, the alternative would be to introduce a new object to track such data, which would be a tremendous effort and more complicated then this. Luckily, NMDnsManager and NMDnsPlugin are already equipped to handle multiple NMIPConfig instances per device (IPv4 vs. IPv6, and Device vs. VPN). Also make "connection.mdns" configurable via global defaults in NetworkManager.conf.
Diffstat (limited to 'man/NetworkManager.conf.xml')
-rw-r--r--man/NetworkManager.conf.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 04f6b54b23..4171bfd09a 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -655,6 +655,9 @@ ipv6.ip6-privacy=0
<term><varname>connection.lldp</varname></term>
</varlistentry>
<varlistentry>
+ <term><varname>connection.mdns</varname></term>
+ </varlistentry>
+ <varlistentry>
<term><varname>connection.stable-id</varname></term>
</varlistentry>
<varlistentry>