resolved: remove configuration knobs for mDNS until it's ready

These bits were intenionally left out while mDNS is under development.

Remove the exposed knobs and man page entries again until this is settled.

diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 5da2d5488ef6507864287aeae34fc1aab2c3c8c8..3ab7fc4a11973d5c3192a410500f443c4cfefe1e 100644 (file)
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -124,22 +124,6 @@
         global setting is on.</para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><varname>MulticastDNS=</varname></term>
-        <listitem><para>Takes a boolean argument or
-        <literal>resolve</literal>. Controls Multicast DNS support
-        (<ulink url="https://tools.ietf.org/html/rfc6762">RFC
-        6762</ulink>) on the local host. If true, enables full
-        Multicast DNS responder and resolver support. If false,
-        disables both. If set to <literal>resolve</literal>, only
-        resolution support is enabled, but responding is
-        disabled. Note that
-        <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        also maintains per-interface Multicast DNS settings. Multicast
-        DNS will be enabled on an interface only if the per-interface
-        and the global setting is on.</para></listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><varname>DNSSEC=</varname></term>
         <listitem><para>Takes a boolean argument or

diff --git a/src/resolve/resolved-gperf.gperf b/src/resolve/resolved-gperf.gperf
index c5ad04afd77ee336916a62d54118778e81851435..82f26215df6df1ff7634ba0f6298f10154a620d1 100644 (file)
--- a/src/resolve/resolved-gperf.gperf
+++ b/src/resolve/resolved-gperf.gperf
@@ -18,5 +18,4 @@ Resolve.DNS,          config_parse_dns_servers,     DNS_SERVER_SYSTEM,   0
 Resolve.FallbackDNS,  config_parse_dns_servers,     DNS_SERVER_FALLBACK, 0
 Resolve.Domains,      config_parse_search_domains,  0,                   0
 Resolve.LLMNR,        config_parse_resolve_support, 0,                   offsetof(Manager, llmnr_support)
-Resolve.MulticastDNS, config_parse_resolve_support, 0,                   offsetof(Manager, mdns_support)
 Resolve.DNSSEC,       config_parse_dnssec_mode,     0,                   offsetof(Manager, dnssec_mode)

diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in
index 0ba572d1134ac1e718a9a07b3c53ab3ca573ac14..efc9c6733a3cfb23efe4e53f71f3294ecf21979c 100644 (file)
--- a/src/resolve/resolved.conf.in
+++ b/src/resolve/resolved.conf.in
@@ -16,5 +16,4 @@
 #FallbackDNS=@DNS_SERVERS@
 #Domains=
 #LLMNR=yes
-#MulticastDNS=no
 #DNSSEC=no