fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP: manager: merge in connection defaults on AddAndActivate

Browse source
This commit is contained in:
Lubomir Rintel 2023-03-14 12:27:36 +01:00
parent c684a56f4a
commit e78ee6c7f9
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/nm-manager.c
View file

@ -6497,6 +6497,7 @@ impl_manager_add_and_activate_connection(NMDBusObject *obj,
NMDevice *device = NULL; NMDevice *device = NULL;
gboolean is_vpn = FALSE; gboolean is_vpn = FALSE;
gs_unref_variant GVariant *settings = NULL; gs_unref_variant GVariant *settings = NULL;
gs_unref_variant GVariant *defaults = NULL;
gs_unref_variant GVariant *options = NULL; gs_unref_variant GVariant *options = NULL;
const char *device_path; const char *device_path;
const char *specific_object_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. /* Try to create a new connection with the given settings.
* We allow empty settings for AddAndActivateConnection(). In that case, * We allow empty settings for AddAndActivateConnection(). In that case,
* the connection will be completed in nm_utils_complete_generic() or * 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()). * validate_activation_request()).
*/ */
incompl_conn = nm_simple_connection_new(); incompl_conn = nm_simple_connection_new();
if (settings && g_variant_n_children(settings)) { if (!_nm_connection_replace_settings(incompl_conn,
if (!_nm_connection_replace_settings(incompl_conn, defaults,
settings, NM_SETTING_PARSE_FLAGS_STRICT,
NM_SETTING_PARSE_FLAGS_STRICT, &error)) {
&error)) { goto error;
goto error;
}
} }
subject = validate_activation_request(self, subject = validate_activation_request(self,