diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2023-03-14 12:27:36 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2023-03-16 17:53:30 +0100 |
| commit | e78ee6c7f95bdf5fbf877b20e0e1645b8501b2e7 (patch) | |
| tree | 96fa380bec96edbc4b0056020903d7a738db2aaf | |
| parent | c684a56f4ad52d44212aec4a427645fbf20d5d97 (diff) | |
WIP: manager: merge in connection defaults on AddAndActivatelr/conn-defaults
| -rw-r--r-- | src/core/nm-manager.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index 4eb9e16798..93618fdd76 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -6497,6 +6497,7 @@ impl_manager_add_and_activate_connection(NMDBusObject *obj, NMDevice *device = NULL; gboolean is_vpn = FALSE; gs_unref_variant GVariant *settings = NULL; + gs_unref_variant GVariant *defaults = NULL; gs_unref_variant GVariant *options = NULL; const char *device_path; const char *specific_object_path; @@ -6595,6 +6596,9 @@ impl_manager_add_and_activate_connection(NMDBusObject *obj, } } + defaults = + nm_config_data_merge_default_settings(nm_config_get_data(priv->config), device, settings); + /* Try to create a new connection with the given settings. * We allow empty settings for AddAndActivateConnection(). In that case, * the connection will be completed in nm_utils_complete_generic() or @@ -6603,13 +6607,11 @@ impl_manager_add_and_activate_connection(NMDBusObject *obj, * validate_activation_request()). */ incompl_conn = nm_simple_connection_new(); - if (settings && g_variant_n_children(settings)) { - if (!_nm_connection_replace_settings(incompl_conn, - settings, - NM_SETTING_PARSE_FLAGS_STRICT, - &error)) { - goto error; - } + if (!_nm_connection_replace_settings(incompl_conn, + defaults, + NM_SETTING_PARSE_FLAGS_STRICT, + &error)) { + goto error; } subject = validate_activation_request(self, |