diff options
| author | Michael Biebl <biebl@debian.org> | 2024-02-13 22:24:20 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-02-13 22:24:20 +0100 |
| commit | 4e0c152343821d62f79db8f047395cabc3005b8e (patch) | |
| tree | 31f8fbf3be8013dc34844ac720eb71dabbf04075 /src/libnm-core-impl/nm-setting.c | |
| parent | 0260b90a50f9c49eb216249afea08ba3f3b8981f (diff) | |
| parent | 6681f77b757bbc42ce5c8868ee9142b7ebc8c059 (diff) | |
Update upstream source from tag 'upstream/1.45.91'
Update to upstream version '1.45.91' with Debian dir bebf00e416cd984203cf3c98296e0b1f3016c889
Diffstat (limited to 'src/libnm-core-impl/nm-setting.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libnm-core-impl/nm-setting.c b/src/libnm-core-impl/nm-setting.c index 758338e5..e6e4d23b 100644 --- a/src/libnm-core-impl/nm-setting.c +++ b/src/libnm-core-impl/nm-setting.c @@ -1077,7 +1077,7 @@ _init_direct(NMSetting *setting) int def_val; def_val = NM_G_PARAM_SPEC_GET_DEFAULT_ENUM(property_info->param_spec); - nm_assert(*p_val == 0); + nm_assert(NM_IN_SET(*p_val, 0, property_info->direct_is_aliased_field ? def_val : 0)); *p_val = def_val; break; } @@ -2638,7 +2638,8 @@ _nm_setting_property_compare_fcn_direct(_NM_SETT_INFO_PROP_COMPARE_FCN_ARGS _nm_ _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)); + _nm_setting_connection_port_type_to_dbus, + _nm_setting_connection_autoconnect_ports_to_dbus)); if (!property_info->param_spec) return nm_assert_unreachable_val(NM_TERNARY_DEFAULT); |