diff options
| author | Michael Biebl <biebl@debian.org> | 2020-04-11 21:30:33 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-04-11 21:30:33 +0200 |
| commit | f914c41532a9e4f2bb44be074466b62e4cac8db3 (patch) | |
| tree | 046e8e7a186afecf299cd80d62fa1c93903dbecf /src/dnsmasq | |
| parent | 19e73abd360f0198f94ce49f36ddf009056f6324 (diff) | |
| parent | 1e5977b62f896e844b548c3007ace9e1dfa7f9ed (diff) | |
Update upstream source from tag 'upstream/1.23.90'
Update to upstream version '1.23.90' with Debian dir 38c3873648b51c73a9e448ccb2ac18152c2b3f85
Diffstat (limited to 'src/dnsmasq')
| -rw-r--r-- | src/dnsmasq/nm-dnsmasq-manager.c | 6 | ||||
| -rw-r--r-- | src/dnsmasq/nm-dnsmasq-utils.c | 5 | ||||
| -rw-r--r-- | src/dnsmasq/tests/meson.build | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c index 735605ee..5581f3fe 100644 --- a/src/dnsmasq/nm-dnsmasq-manager.c +++ b/src/dnsmasq/nm-dnsmasq-manager.c @@ -140,7 +140,7 @@ create_dm_cmd_line (const char *iface, */ nm_strv_ptrarray_add_string_dup (cmd, "--strict-order"); - nm_utils_inet4_ntop (listen_address->address, listen_address_s); + _nm_utils_inet4_ntop (listen_address->address, listen_address_s); nm_strv_ptrarray_add_string_concat (cmd, "--listen-address=", listen_address_s); @@ -169,7 +169,7 @@ create_dm_cmd_line (const char *iface, g_string_append (s, "--dhcp-option=option:dns-server"); for (i = 0; i < n; i++) { g_string_append_c (s, ','); - g_string_append (s, nm_utils_inet4_ntop (nm_ip4_config_get_nameserver (ip4_config, i), tmpaddr)); + g_string_append (s, _nm_utils_inet4_ntop (nm_ip4_config_get_nameserver (ip4_config, i), tmpaddr)); } nm_strv_ptrarray_take_gstring (cmd, &s); } @@ -339,7 +339,7 @@ nm_dnsmasq_manager_new (const char *iface) static void finalize (GObject *object) { - NMDnsMasqManagerPrivate *priv = NM_DNSMASQ_MANAGER_GET_PRIVATE ((NMDnsMasqManager *) object); + NMDnsMasqManagerPrivate *priv = NM_DNSMASQ_MANAGER_GET_PRIVATE (object); nm_dnsmasq_manager_stop (NM_DNSMASQ_MANAGER (object)); diff --git a/src/dnsmasq/nm-dnsmasq-utils.c b/src/dnsmasq/nm-dnsmasq-utils.c index 01d59ecc..2373b422 100644 --- a/src/dnsmasq/nm-dnsmasq-utils.c +++ b/src/dnsmasq/nm-dnsmasq-utils.c @@ -95,9 +95,8 @@ nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr, first = htonl (first); last = htonl (last); - nm_utils_inet4_ntop (first, out_first); - nm_utils_inet4_ntop (last, out_last); + _nm_utils_inet4_ntop (first, out_first); + _nm_utils_inet4_ntop (last, out_last); return TRUE; } - diff --git a/src/dnsmasq/tests/meson.build b/src/dnsmasq/tests/meson.build index 6e429899..4584086e 100644 --- a/src/dnsmasq/tests/meson.build +++ b/src/dnsmasq/tests/meson.build @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1+ + test_unit = 'test-dnsmasq-utils' exe = executable( |