From 5307e07e3b8dc13040f021ba9874130b0bc44800 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 24 Oct 2016 22:33:59 +0200 Subject: [PATCH] dns: don't print empty configurations Previously we printed the DNS configuration for all devices including unmanaged and unconfigured ones: dns-mgr: config: 100 best v4 ens3 : 192.168.10.1 dns-mgr: config: 100 default v6 ens3 : fd01:abcd::3681:c4ff:fec0:fe94 dns-mgr: config: 100 default v4 lo : dns-mgr: config: 100 default v6 lo : dns-mgr: config: 100 default v4 ens9 : dns-mgr: config: 100 default v6 ens9 : Instead, print only devices that have name servers set. --- src/dns/nm-dns-manager.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c index 30e448c325..3a3ae3a669 100644 --- a/src/dns/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c @@ -1044,13 +1044,16 @@ update_dns (NMDnsManager *self, prev_prio = prio; - _LOGT ("config: %8d %-7s v%c %-16s %s: %s", - prio, - _config_type_to_string (current->type), - v4 ? '4' : '6', - current->iface, - skip ? "" : "", - get_nameserver_list (current->config, &tmp_gstring)); + if ( ( v4 && nm_ip4_config_get_num_nameservers ((NMIP4Config *) current->config)) + || (!v4 && nm_ip6_config_get_num_nameservers ((NMIP6Config *) current->config))) { + _LOGT ("config: %8d %-7s v%c %-16s %s: %s", + prio, + _config_type_to_string (current->type), + v4 ? '4' : '6', + current->iface, + skip ? "" : "", + get_nameserver_list (current->config, &tmp_gstring)); + } if (!skip) { merge_one_ip_config_data (self, &rc, current);