From d33c995d45caadebe2c7cc0e3e625f0d828a7a4f Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 13 May 2019 14:30:48 +0200 Subject: [PATCH] manager: relax condition when checking for duplicate ACs An active connection started by user could be queued in state UNKNOWN which means the device hasn't started activating yet. Eventually it will, and we don't want to cancel the user activation because of an internal autoconnection attempt. --- src/nm-manager.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 36d0ebc3a9..b6beb61286 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4873,9 +4873,7 @@ _internal_activation_auth_done (NMManager *self, c_list_for_each_entry (ac, &priv->active_connections_lst_head, active_connections_lst) { if ( nm_active_connection_get_device (ac) == nm_active_connection_get_device (active) && nm_active_connection_get_settings_connection (ac) == nm_active_connection_get_settings_connection (active) - && NM_IN_SET (nm_active_connection_get_state (ac), - NM_ACTIVE_CONNECTION_STATE_ACTIVATING, - NM_ACTIVE_CONNECTION_STATE_ACTIVATED)) { + && nm_active_connection_get_state (ac) <= NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { g_set_error (&error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_ALREADY_ACTIVE,