Merge tag 'debian/1.34.0-2' into ubuntu/master

network-manager Debian release 1.34.0-2

1 files changed, 7 insertions, 15 deletions

diff --git a/src/core/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c
index c789aaee..af1d2238 100644
--- a/src/core/dhcp/nm-dhcp-systemd.c
+++ b/src/core/dhcp/nm-dhcp-systemd.c
@@ -592,7 +592,7 @@ ip4_start(NMDhcpClient *client, const char *last_ip4_address, GError **error)
         return FALSE;
     }
 
-    _LOGT("dhcp-client4: set %p", sd_client);
+    _LOGT("dhcp-client4: set " NM_HASH_OBFUSCATE_PTR_FMT, NM_HASH_OBFUSCATE_PTR(sd_client));
 
     r = sd_dhcp_client_attach_event(sd_client, NULL, 0);
     if (r < 0) {
@@ -1124,23 +1124,15 @@ nm_dhcp_systemd_class_init(NMDhcpSystemdClass *sdhcp_class)
 
 const NMDhcpClientFactory _nm_dhcp_client_factory_systemd = {
     .name         = "systemd",
-    .get_type     = nm_dhcp_systemd_get_type,
-    .experimental = TRUE,
+    .get_type_4   = nm_dhcp_systemd_get_type,
+    .get_type_6   = nm_dhcp_systemd_get_type,
+    .undocumented = TRUE,
 };
 
 /*****************************************************************************/
 
-static GType
-_get_type_per_addr_family(int addr_family)
-{
-    nm_assert_addr_family(addr_family);
-
-    if (addr_family == AF_INET)
-        return nm_dhcp_nettools_get_type();
-    return nm_dhcp_systemd_get_type();
-}
-
 const NMDhcpClientFactory _nm_dhcp_client_factory_internal = {
-    .name                     = "internal",
-    .get_type_per_addr_family = _get_type_per_addr_family,
+    .name       = "internal",
+    .get_type_4 = nm_dhcp_nettools_get_type,
+    .get_type_6 = nm_dhcp_systemd_get_type,
 };