fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 11:40:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

doc: merge branch 'th/doc-mdns'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1467

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1841
This commit is contained in:
Thomas Haller 2024-01-29 09:52:04 +01:00
commit 0ce996ba18
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
man/NetworkManager.conf.xml
View file

@ -823,6 +823,11 @@ domains=ALL
and these default values only matter if the per-profile values explicitly indicates
to use the default from <literal>NetworkManager.conf</literal>.
</para>
<para>
Note that while nmcli supports various aliases and convenience features for configuring
properties, the settings in this section do not. For example, enum values usually only
can be configured via their numeric magic number.
</para>
<para>
Example:
<programlisting>
@ -868,7 +873,13 @@ ipv6.ip6-privacy=0
</varlistentry>
<varlistentry>
<term><varname>connection.mdns</varname></term>
<listitem><para>If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "no" (0) and for all other plugins also "no" (0).</para></listitem>
<listitem><para>
Currently only the systemd-resolve DNS plugin supports this setting.
If the setting is unspecified both in the profile and in the global
default here, then the default is determined by systemd-resolved.
See <literal>MulticastDNS=</literal> in
<citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>connection.mptcp-flags</varname></term>

7
src/libnm-core-impl/nm-setting-connection.c
View file

@ -2724,11 +2724,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
* for the connection, "no" (0) disable mDNS for the interface, "resolve"
* (1) do not register hostname but allow resolving of mDNS host names
* and "default" (-1) to allow lookup of a global default in NetworkManager.conf.
* If unspecified, "default" ultimately depends on the DNS plugin (which
* for systemd-resolved currently means "no").
* If unspecified, "default" ultimately depends on the DNS plugin.
*
* This feature requires a plugin which supports mDNS. Otherwise, the
* setting has no effect. One such plugin is dns-systemd-resolved.
* setting has no effect. Currently the only supported DNS plugin is
* systemd-resolved. For systemd-resolved, the default is configurable via
* MulticastDNS= setting in resolved.conf.
*
* Since: 1.12
**/