diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
| commit | b3c2e57e153446d32d16f2d99e6abbb50146dddb (patch) | |
| tree | e71a5353ff26c7e33cbe6e482874bedc1c3cc1cd /src/libnm-core-impl/nm-setting-gsm.c | |
| parent | 1d817ebf5302c204e3ce9d3512db13bf834fee33 (diff) | |
| parent | ed857ba34efc2ec899f2e3fbd8e35324561a55b2 (diff) | |
Merge tag 'debian/1.42.0-1' into ubuntu/master
network-manager Debian release 1.42.0-1
Diffstat (limited to 'src/libnm-core-impl/nm-setting-gsm.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-gsm.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libnm-core-impl/nm-setting-gsm.c b/src/libnm-core-impl/nm-setting-gsm.c index 15460ccc..3fe5dfa1 100644 --- a/src/libnm-core-impl/nm-setting-gsm.c +++ b/src/libnm-core-impl/nm-setting-gsm.c @@ -460,12 +460,12 @@ verify_secrets(NMSetting *setting, NMConnection *connection, GError **error) } static GPtrArray * -need_secrets(NMSetting *setting) +need_secrets(NMSetting *setting, gboolean check_rerequest) { NMSettingGsmPrivate *priv = NM_SETTING_GSM_GET_PRIVATE(setting); GPtrArray *secrets = NULL; - if (priv->password && *priv->password) + if (!check_rerequest && priv->password && *priv->password) return NULL; if (priv->username) { @@ -545,7 +545,8 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) PROP_NUMBER, NM_SETTING_PARAM_NONE, NMSettingGsmPrivate, - number); + number, + .is_deprecated = TRUE, ); /** * NMSettingGsm:username: @@ -744,10 +745,12 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) /* Ignore incoming deprecated properties */ _nm_properties_override_dbus(properties_override, "allowed-bands", - &nm_sett_info_propert_type_deprecated_ignore_u); + &nm_sett_info_propert_type_deprecated_ignore_u, + .dbus_deprecated = TRUE, ); _nm_properties_override_dbus(properties_override, "network-type", - &nm_sett_info_propert_type_deprecated_ignore_i); + &nm_sett_info_propert_type_deprecated_ignore_i, + .dbus_deprecated = TRUE, ); g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); |