Merge tag 'debian/1.42.4-1' into debian/bullseye-backports

network-manager Debian release 1.42.4-1

1 files changed, 14 insertions, 8 deletions

diff --git a/src/libnm-client-impl/nm-conn-utils.c b/src/libnm-client-impl/nm-conn-utils.c
index 5d04cd32..223c18e6 100644
--- a/src/libnm-client-impl/nm-conn-utils.c
+++ b/src/libnm-client-impl/nm-conn-utils.c
@@ -14,6 +14,13 @@
 #include "libnm-glib-aux/nm-secret-utils.h"
 #include "nm-simple-connection.h"
 
+/**
+ * SECTION:nm-conn-utils
+ * @short_description: Connection utilities
+ *
+ * Extra connection functionality.
+ */
+
 static gboolean
 _wg_complete_peer(GPtrArray      **p_peers,
                   NMWireGuardPeer *peer_take,
@@ -271,11 +278,11 @@ nm_conn_wireguard_import(const char *filename, GError **error)
                     int         addr_family;
                     int         prefix_len;
 
-                    if (!nm_utils_parse_inaddr_prefix_bin(AF_UNSPEC,
-                                                          value_word,
-                                                          &addr_family,
-                                                          &addr_bin,
-                                                          &prefix_len))
+                    if (!nm_inet_parse_with_prefix_bin(AF_UNSPEC,
+                                                       value_word,
+                                                       &addr_family,
+                                                       &addr_bin,
+                                                       &prefix_len))
                         goto fail_invalid_value;
 
                     p_data_addr = (addr_family == AF_INET) ? &data_addr_v4 : &data_addr_v6;
@@ -315,13 +322,12 @@ nm_conn_wireguard_import(const char *filename, GError **error)
                     NMIPAddr    addr_bin;
                     int         addr_family;
 
-                    if (nm_utils_parse_inaddr_bin(AF_UNSPEC, value_word, &addr_family, &addr_bin)) {
+                    if (nm_inet_parse_bin(AF_UNSPEC, value_word, &addr_family, &addr_bin)) {
                         p_data_dns = (addr_family == AF_INET) ? &data_dns_v4 : &data_dns_v6;
                         if (!*p_data_dns)
                             *p_data_dns = g_ptr_array_new_with_free_func(g_free);
 
-                        g_ptr_array_add(*p_data_dns,
-                                        nm_utils_inet_ntop_dup(addr_family, &addr_bin));
+                        g_ptr_array_add(*p_data_dns, nm_inet_ntop_dup(addr_family, &addr_bin));
                         continue;
                     }