fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 20:00:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: ensure normalized connection during add-and-activate

Browse source 
nm_connection_verify() returns success for fully valid (normalized)
connections and also connections that are NM_SETTING_VERIFY_NORMALIZABLE.

We really want to fully normalize the profiles during add-and-activate.
This commit is contained in:
Thomas Haller 2019-06-20 15:45:34 +02:00
parent 6d4592354f
commit d1f269ab36
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/nm-device.c
View file

@ -5753,7 +5753,7 @@ nm_device_complete_connection (NMDevice *self,
error))
return FALSE;
if (!nm_connection_verify (connection, error))
if (!nm_connection_normalize (connection, NULL, NULL, error))
return FALSE;
return nm_device_check_connection_compatible (self, connection, error);

2
src/nm-manager.c
View file

@ -5517,6 +5517,8 @@ impl_manager_add_and_activate_connection (NMDBusObject *obj,
goto error;
}
nm_assert (_nm_connection_verify (incompl_conn, NULL) == NM_SETTING_VERIFY_SUCCESS);
active = _new_active_connection (self,
is_vpn,
NULL,

2
src/settings/nm-settings.c
View file

@ -720,7 +720,7 @@ nm_settings_add_connection_dbus (NMSettings *self,
g_return_if_fail (G_IS_DBUS_METHOD_INVOCATION (context));
/* Connection must be valid, of course */
if (!nm_connection_verify (connection, &tmp_error)) {
if (_nm_connection_verify (connection, &tmp_error) != NM_SETTING_VERIFY_SUCCESS) {
error = g_error_new (NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_CONNECTION,
"The connection was invalid: %s",