diff options
| author | Michael Biebl <biebl@debian.org> | 2014-07-06 03:04:17 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-07-06 03:04:17 +0200 |
| commit | 3ce667b6ee6b86291bbe60ef93cba7f11a5c5400 (patch) | |
| tree | af3daa7221e898b72f3de26eb2cf0c1b1c8661b0 /src/dns-manager/nm-dns-utils.c | |
| parent | f02d31d95af29678092d1ff01f714621bc9dcc0f (diff) | |
| parent | 33491bc4279481db8ae47213e34a6d695a0e8830 (diff) | |
Merge tag 'upstream/0.9.10.0'
Upstream version 0.9.10.0
Diffstat (limited to 'src/dns-manager/nm-dns-utils.c')
| -rw-r--r-- | src/dns-manager/nm-dns-utils.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/dns-manager/nm-dns-utils.c b/src/dns-manager/nm-dns-utils.c index 615adfd1..3e564ace 100644 --- a/src/dns-manager/nm-dns-utils.c +++ b/src/dns-manager/nm-dns-utils.c @@ -46,7 +46,10 @@ add_ip4_to_rdns_array (guint32 ip, GPtrArray *domains) /* network byte order */ else if (defprefix == 24) str = g_strdup_printf ("%u.%u.%u.in-addr.arpa", p[2] & 0xFF, p[1] & 0xFF, p[0] & 0xFF); - g_return_if_fail (str != NULL); + if (!str) { + g_return_if_fail (str != NULL); + return; + } /* Suppress duplicates */ for (i = 0; i < domains->len; i++) { @@ -79,15 +82,15 @@ nm_dns_utils_get_ip4_rdns_domains (NMIP4Config *ip4) */ for (i = 0; i < nm_ip4_config_get_num_addresses (ip4); i++) { - NMIP4Address *addr = nm_ip4_config_get_address (ip4, i); + const NMPlatformIP4Address *address = nm_ip4_config_get_address (ip4, i); - add_ip4_to_rdns_array (nm_ip4_address_get_address (addr), domains); + add_ip4_to_rdns_array (address->address, domains); } for (i = 0; i < nm_ip4_config_get_num_routes (ip4); i++) { - NMIP4Route *route = nm_ip4_config_get_route (ip4, i); + const NMPlatformIP4Route *route = nm_ip4_config_get_route (ip4, i); - add_ip4_to_rdns_array (nm_ip4_route_get_dest (route), domains); + add_ip4_to_rdns_array (route->network, domains); } /* Terminating NULL so we can use g_strfreev() to free it */ |