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

manager: don't coalesce duplicate internal activations with different reasons

Browse source 
When combining internal activations, do that only if their reason also
matches.

Fixes: 4985ca5ada
(cherry picked from commit 786adf969c)
This commit is contained in:
Thomas Haller 2018-04-12 15:47:40 +02:00
parent aeaa895049
commit 8e64c4fa76
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/nm-manager.c
View file

@ -4083,7 +4083,8 @@ nm_manager_activate_connection (NMManager *self,
&& g_strcmp0 (nm_active_connection_get_specific_object (active), specific_object) == 0
&& nm_active_connection_get_device (active) == device
&& nm_auth_subject_is_internal (nm_active_connection_get_subject (active))
&& nm_auth_subject_is_internal (subject))
&& nm_auth_subject_is_internal (subject)
&& nm_active_connection_get_activation_reason (active) == activation_reason)
return active;
}