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

fix2

Browse source
This commit is contained in:
Wen Liang 2023-11-05 15:28:02 -05:00
parent 7402bd83ff
commit 015a38065e
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3728,6 +3728,7 @@ recheck_assume_connection(NMManager *self, NMDevice *device)
* deactivation after restart (if the user logs out).
*
* This should be improved, but it's unclear how. */
_LOGW(LOGD_DEVICE, "-------called in recheck_assume_connection-------");
active = _new_active_connection(
self,
FALSE,
@ -6325,6 +6326,7 @@ nm_manager_activate_connection(NMManager *self,
return active;
}
_LOGW(LOGD_DEVICE, "-------called in nm_manager_activate_connection----");
active = _new_active_connection(self,
is_vpn,
sett_conn,
@ -6599,6 +6601,7 @@ impl_manager_activate_connection(NMDBusObject *obj,
if (!subject)
goto error;
_LOGW(LOGD_DEVICE, "-------called in impl_manager_activate_connection-----");
active = _new_active_connection(self,
is_vpn,
sett_conn,
@ -6920,6 +6923,7 @@ impl_manager_add_and_activate_connection(NMDBusObject *obj,
nm_assert(_nm_connection_verify(incompl_conn, NULL) == NM_SETTING_VERIFY_SUCCESS);
_LOGW(LOGD_DEVICE, "-------called in impl_manager_add_and_activate_connection-----");
active = _new_active_connection(self,
is_vpn,
NULL,

7
src/core/settings/nm-settings-connection.c
View file

@ -1611,9 +1611,10 @@ update_auth_cb(NMSettingsConnection *self,
info->subject);
/* Reset auto retries back to default since connection was updated */
nm_manager_devcon_autoconnect_retries_reset(nm_settings_connection_get_manager(self),
NULL,
self);
if (!nm_settings_connection_autoconnect_is_blocked(self))
nm_manager_devcon_autoconnect_retries_reset(nm_settings_connection_get_manager(self),
NULL,
self);
out:
update_complete(self, info, error);