diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-24 12:54:31 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-11-27 15:21:58 +0100 |
| commit | d8b4403f6bf46b209071c138ef388737ee5a8770 (patch) | |
| tree | 84796db9197e8c0b6d5d2a192d741124dc88eebc /src/nm-policy.c | |
| parent | 5e5121a4838cd82537351b28fd027673e7a50ddd (diff) | |
policy: don't clear autoconnect-blocked-reason user-request on internal reasons
reset_autoconnect_all() as two callers with only_no_secrets=FALSE:
- sleeping_changed() when NM returns from sleep.
- when device changes to state DISCONNECTED with reason
CARRIER.
In both cases, this should not overwrite a previous decision by
the user that the connection should not autoconnect.
Diffstat (limited to 'src/nm-policy.c')
| -rw-r--r-- | src/nm-policy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c index f31b1cbb3..c9a993485 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1440,7 +1440,8 @@ reset_autoconnect_all (NMPolicy *self, nm_settings_connection_autoconnect_retries_reset (connection); if (nm_settings_connection_autoconnect_blocked_reason_set (connection, - NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_ALL, + NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_ALL + & ~NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST, FALSE)) changed = TRUE; } |