diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-15 01:05:35 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-15 01:05:35 +0200 |
| commit | d1148fc0e24d30260606f292db3bb21ba9a6adc5 (patch) | |
| tree | 5f2251e1da11451b72c9dedbe629e3a90ec5bf13 /src/dns | |
| parent | ffe03e75298bcd15849e314c8233cb9b696d59a3 (diff) | |
| parent | c240974325c552cad177c457d6ff04e381fd77a3 (diff) | |
Update upstream source from tag 'upstream/1.14.0'
Update to upstream version '1.14.0' with Debian dir a85bbd526d758f044876cc0acaa7be950ec06fae
Diffstat (limited to 'src/dns')
| -rw-r--r-- | src/dns/nm-dns-dnsmasq.c | 10 | ||||
| -rw-r--r-- | src/dns/nm-dns-unbound.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c index 90a08d59..cb7a626c 100644 --- a/src/dns/nm-dns-dnsmasq.c +++ b/src/dns/nm-dns-dnsmasq.c @@ -183,10 +183,12 @@ add_ip_config (NMDnsDnsmasq *self, GVariantBuilder *servers, const NMDnsIPConfig domain[0] ? domain : NULL); } - for (j = 0; ip_data->domains.reverse[j]; j++) { - add_dnsmasq_nameserver (self, servers, - ip_addr_to_string_buf, - ip_data->domains.reverse[j]); + if (ip_data->domains.reverse) { + for (j = 0; ip_data->domains.reverse[j]; j++) { + add_dnsmasq_nameserver (self, servers, + ip_addr_to_string_buf, + ip_data->domains.reverse[j]); + } } } } diff --git a/src/dns/nm-dns-unbound.c b/src/dns/nm-dns-unbound.c index e06128aa..b900f29e 100644 --- a/src/dns/nm-dns-unbound.c +++ b/src/dns/nm-dns-unbound.c @@ -43,7 +43,7 @@ update (NMDnsPlugin *plugin, const CList *ip_config_lst_head, const char *hostname) { - char *argv[] = { DNSSEC_TRIGGER_SCRIPT, "--async", "--update", NULL }; + char *argv[] = { DNSSEC_TRIGGER_PATH, "--async", "--update", NULL }; int status; /* TODO: We currently call a script installed with the dnssec-trigger |