Commit b4ec428e authored by Dimitri John Ledkov's avatar Dimitri John Ledkov
Browse files

Disable LLMNR and MulticastDNS by default LP: #1739672

parent 5032046d
systemd (237-1ubuntu3) bionic; urgency=medium
* Re-enable gnu-efi on arm64, binutils is fixed.
* Re-enable gnu-efi on arm64, binutils is fixed
* Cherrpick PR8133 to resolve too strict PidFile handling, which breaks
services starting with potentially insecure pidfiles e.g. munin.
services starting with potentially insecure pidfiles e.g. munin
* Disable LLMNR and MulticastDNS by default LP: #1739672
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 09 Feb 2018 15:49:01 +0000
......
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Fri, 9 Feb 2018 15:57:54 +0000
Subject: UBUNTU: resolved: disable global LLMNR and MulticastDNS by default.
LP: #1739672
---
src/resolve/resolved-manager.c | 4 ++--
src/resolve/resolved.conf.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 2ee0277..37cef3f 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -596,8 +596,8 @@ int manager_new(Manager **ret) {
m->dns_stub_udp_fd = m->dns_stub_tcp_fd = -1;
m->hostname_fd = -1;
- m->llmnr_support = RESOLVE_SUPPORT_YES;
- m->mdns_support = RESOLVE_SUPPORT_YES;
+ m->llmnr_support = RESOLVE_SUPPORT_NO;
+ m->mdns_support = RESOLVE_SUPPORT_NO;
m->dnssec_mode = DEFAULT_DNSSEC_MODE;
m->enable_cache = true;
m->dns_stub_listener_mode = DNS_STUB_LISTENER_UDP;
diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in
index e6b2062..bcd7a92 100644
--- a/src/resolve/resolved.conf.in
+++ b/src/resolve/resolved.conf.in
@@ -15,8 +15,8 @@
#DNS=
#FallbackDNS=@DNS_SERVERS@
#Domains=
-#LLMNR=yes
-#MulticastDNS=yes
+#LLMNR=no
+#MulticastDNS=no
#DNSSEC=@DEFAULT_DNSSEC_MODE@
#Cache=yes
#DNSStubListener=udp
......@@ -33,3 +33,4 @@ debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
debian/UBUNTU-drop-using-kvm-for-qemu-tests-as-this-current.patch
debian/UBUNTU-test-test-functions-drop-all-prefixes.patch
debian/UBUNTU-test-process-util-fails-to-verify-cmdline-changes-in-unpr.patch
debian/UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment