fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 10:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: reset GSM's APN/username/password when setting auto-config

Browse source 
Otherwise,

  nmcli connection modify "$GSM_PROFILE" gsm.auto-config yes

has no effect -- if APN/username/password is set.
This commit is contained in:
Thomas Haller 2021-04-27 08:38:12 +02:00
parent 40032f4614
commit 95932ab577
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/libnmc-setting/nm-meta-setting-desc.c
View file

@ -3101,6 +3101,28 @@ static gboolean _set_fcn_dcb_bool(ARGS_SET_FCN)
return TRUE;
}
static gboolean _set_fcn_gsm_auto_config(ARGS_SET_FCN)
{
if (!_set_fcn_gobject_bool_impl(property_info, setting, modifier, value, error))
return FALSE;
if (nm_setting_gsm_get_auto_config(NM_SETTING_GSM(setting))) {
/* the auto-config flag gets normalized to FALSE, if any of
* APN, username or password is set. Thus, setting auto-config
* needs us to reset those flags too. */
g_object_set(setting,
NM_SETTING_GSM_APN,
NULL,
NM_SETTING_GSM_USERNAME,
NULL,
NM_SETTING_GSM_PASSWORD,
NULL,
NULL);
}
return TRUE;
}
static gboolean _set_fcn_gsm_sim_operator_id(ARGS_SET_FCN)
{
const char *p = value;
@ -5640,7 +5662,11 @@ static const NMMetaPropertyInfo *const property_infos_ETHTOOL[] = {
#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_GSM
static const NMMetaPropertyInfo *const property_infos_GSM[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_AUTO_CONFIG,
.property_type = &_pt_gobject_bool,
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_gsm_auto_config,
.complete_fcn = _complete_fcn_gobject_bool,
),
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_NUMBER,
.property_type = &_pt_gobject_string,