diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-13 16:10:30 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-13 16:31:40 +0100 |
| commit | 5a09f7759860f4f2a9bb01471ca8099cd705bc10 (patch) | |
| tree | 3a9cffc9622d53c9196771a1c7924bceb754f118 /debian/patches/Update-dnsmasq-parameters.patch | |
| parent | 25691220fd27093630cf244e219b2f4f1f4e749e (diff) | |
| parent | ca847639aab94434daed120c874e1100c3d75dcf (diff) | |
Merge remote-tracking branch 'salsa/debian/master'
Diffstat (limited to 'debian/patches/Update-dnsmasq-parameters.patch')
| -rw-r--r-- | debian/patches/Update-dnsmasq-parameters.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch index d22d0a28..9787e983 100644 --- a/debian/patches/Update-dnsmasq-parameters.patch +++ b/debian/patches/Update-dnsmasq-parameters.patch @@ -10,26 +10,26 @@ See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolv src/dns/nm-dns-manager.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -Index: network-manager-1.20.0/src/dns/nm-dns-dnsmasq.c +Index: network-manager-1.22.2/src/dns/nm-dns-dnsmasq.c =================================================================== ---- network-manager-1.20.0.orig/src/dns/nm-dns-dnsmasq.c -+++ network-manager-1.20.0/src/dns/nm-dns-dnsmasq.c -@@ -336,8 +336,8 @@ start_dnsmasq (NMDnsDnsmasq *self) - argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */ - argv[idx++] = "--bind-interfaces"; - argv[idx++] = "--pid-file=" PIDFILE; -- argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */ -- argv[idx++] = "--cache-size=400"; -+ argv[idx++] = "--listen-address=127.0.1.1"; /* Should work for both 4 and 6 */ -+ argv[idx++] = "--cache-size=0"; - argv[idx++] = "--clear-on-reload"; /* clear cache when dns server changes */ - argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */ - argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ -Index: network-manager-1.20.0/src/dns/nm-dns-manager.c +--- network-manager-1.22.2.orig/src/dns/nm-dns-dnsmasq.c ++++ network-manager-1.22.2/src/dns/nm-dns-dnsmasq.c +@@ -494,8 +494,8 @@ _gl_pid_spawn_next_step (void) + argv[argv_idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */ + argv[argv_idx++] = "--bind-interfaces"; + argv[argv_idx++] = "--pid-file=" PIDFILE; +- argv[argv_idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */ +- argv[argv_idx++] = "--cache-size=400"; ++ argv[argv_idx++] = "--listen-address=127.0.1.1"; /* Should work for both 4 and 6 */ ++ argv[argv_idx++] = "--cache-size=0"; + argv[argv_idx++] = "--clear-on-reload"; /* clear cache when dns server changes */ + argv[argv_idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */ + argv[argv_idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ +Index: network-manager-1.22.2/src/dns/nm-dns-manager.c =================================================================== ---- network-manager-1.20.0.orig/src/dns/nm-dns-manager.c -+++ network-manager-1.20.0/src/dns/nm-dns-manager.c -@@ -1485,12 +1485,12 @@ update_dns (NMDnsManager *self, +--- network-manager-1.22.2.orig/src/dns/nm-dns-manager.c ++++ network-manager-1.22.2/src/dns/nm-dns-manager.c +@@ -1469,12 +1469,12 @@ update_dns (NMDnsManager *self, NM_CAST_STRV_CC (nameservers), NM_CAST_STRV_CC (options)); @@ -44,7 +44,7 @@ Index: network-manager-1.20.0/src/dns/nm-dns-manager.c if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) { /* systemd-resolved uses a different link-local address */ -@@ -1832,7 +1832,7 @@ nm_dns_manager_stop (NMDnsManager *self) +@@ -1757,7 +1757,7 @@ nm_dns_manager_stop (NMDnsManager *self) _LOGT ("stopping..."); /* If we're quitting, leave a valid resolv.conf in place, not one |