New upstream version 1.45.91 upstream/1.45.91

2 files changed, 3 insertions, 25 deletions

diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index 4acf33e0..bf0f272c 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -3962,7 +3962,7 @@ typedef struct {
 
 typedef struct {
     const char *name;
-    DiffKey     keys[31];
+    DiffKey     keys[32];
 } DiffSetting;
 
 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
@@ -4023,6 +4023,7 @@ test_connection_diff_a_only(void)
           {NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_DIFF_RESULT_IN_A},
           {NM_SETTING_CONNECTION_PORT_TYPE, NM_SETTING_DIFF_RESULT_IN_A},
           {NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, NM_SETTING_DIFF_RESULT_IN_A},
+          {NM_SETTING_CONNECTION_AUTOCONNECT_PORTS, NM_SETTING_DIFF_RESULT_IN_A},
           {NM_SETTING_CONNECTION_SECONDARIES, NM_SETTING_DIFF_RESULT_IN_A},
           {NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A},
           {NM_SETTING_CONNECTION_METERED, NM_SETTING_DIFF_RESULT_IN_A},
@@ -4081,6 +4082,7 @@ test_connection_diff_a_only(void)
              {NM_SETTING_IP_CONFIG_REQUIRED_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP_CONFIG_DNS_PRIORITY, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP_CONFIG_DHCP_IAID, NM_SETTING_DIFF_RESULT_IN_A},
+             {NM_SETTING_IP_CONFIG_DHCP_DSCP, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP_CONFIG_DHCP_REJECT_SERVERS, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP4_CONFIG_LINK_LOCAL, NM_SETTING_DIFF_RESULT_IN_A},
diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c
index 4b1aa2c1..72b855a5 100644
--- a/src/libnm-core-impl/tests/test-setting.c
+++ b/src/libnm-core-impl/tests/test-setting.c
@@ -4664,10 +4664,7 @@ test_setting_metadata(void)
             } else if (sip->property_type->direct_type == NM_VALUE_TYPE_ENUM) {
                 const GParamSpecEnum *pspec;
 
-                g_assert(sip->property_type == &nm_sett_info_propert_type_direct_enum);
                 g_assert(g_variant_type_equal(sip->property_type->dbus_type, "i"));
-                g_assert(sip->property_type->to_dbus_fcn
-                         == _nm_setting_property_to_dbus_fcn_direct);
                 g_assert(sip->param_spec);
                 g_assert(g_type_is_a(sip->param_spec->value_type, G_TYPE_ENUM));
                 g_assert(sip->param_spec->value_type != G_TYPE_ENUM);
@@ -4706,10 +4703,6 @@ test_setting_metadata(void)
                                        INFINIBAND_ALEN));
                 } else {
                     g_assert(g_variant_type_equal(sip->property_type->dbus_type, "s"));
-                    g_assert(NM_IN_SET(sip->property_type->to_dbus_fcn,
-                                       _nm_setting_property_to_dbus_fcn_direct,
-                                       _nm_setting_connection_controller_to_dbus,
-                                       _nm_setting_connection_port_type_to_dbus));
                     can_have_direct_set_fcn = TRUE;
                 }
                 g_assert(sip->param_spec);
@@ -4847,18 +4840,6 @@ check_done:;
 
             if (sip->property_type->from_dbus_fcn == _nm_setting_property_from_dbus_fcn_gprop)
                 g_assert(sip->param_spec);
-            if (sip->property_type->from_dbus_fcn) {
-                if (sip->property_type->direct_type != NM_VALUE_TYPE_NONE) {
-                    g_assert(NM_IN_SET(sip->property_type->from_dbus_fcn,
-                                       _nm_setting_property_from_dbus_fcn_direct_ip_config_gateway,
-                                       _nm_setting_property_from_dbus_fcn_direct_mac_address,
-                                       _nm_setting_connection_controller_from_dbus,
-                                       _nm_setting_connection_master_from_dbus,
-                                       _nm_setting_connection_slave_type_from_dbus,
-                                       _nm_setting_connection_port_type_from_dbus,
-                                       _nm_setting_property_from_dbus_fcn_direct));
-                }
-            }
 
             g_assert(sip->property_type->from_dbus_is_full
                      == NM_IN_SET(sip->property_type->from_dbus_fcn,
@@ -4875,11 +4856,6 @@ check_done:;
             } else if (sip->property_type->compare_fcn == _nm_setting_property_compare_fcn_direct) {
                 g_assert(sip->param_spec);
                 g_assert(sip->property_type->direct_type != NM_VALUE_TYPE_NONE);
-                g_assert(NM_IN_SET(sip->property_type->to_dbus_fcn,
-                                   _nm_setting_property_to_dbus_fcn_direct,
-                                   _nm_setting_property_to_dbus_fcn_direct_mac_address,
-                                   _nm_setting_connection_controller_to_dbus,
-                                   _nm_setting_connection_port_type_to_dbus));
             } else if (sip->property_type->compare_fcn == _nm_setting_property_compare_fcn_ignore) {
                 if (NM_IN_SET(sip->property_type,
                               &nm_sett_info_propert_type_deprecated_ignore_i,