summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-11-24 12:45:23 +0100
committerThomas Haller <thaller@redhat.com>2017-11-27 15:21:58 +0100
commit3a826a83df6b3cc36b2f57654864c3a37ca8ec25 (patch)
tree6611c2f33198735b4b2ca8b0ca710118997c43f9
parentb154f29b2be8e8c11ab0a8efef4c8216c9fb2445 (diff)
downloadNetworkManager-3a826a83df6b3cc36b2f57654864c3a37ca8ec25.tar.gz
policy: only reset autoconnect-blocked-reason FAILED in activate_slave_connections()
The reasons no-secret and user-request still hold.
-rw-r--r--src/nm-policy.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c
index d39f8cc848..7cb8379587 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -1608,12 +1608,9 @@ activate_slave_connections (NMPolicy *self, NMDevice *device)
if (!internal_activation)
nm_settings_connection_autoconnect_retries_reset (connection);
- if (nm_settings_connection_autoconnect_blocked_reason_get (connection,
- NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED)) {
- nm_settings_connection_autoconnect_blocked_reason_set (connection,
- NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_ALL,
- FALSE);
- }
+ nm_settings_connection_autoconnect_blocked_reason_set (connection,
+ NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED,
+ FALSE);
}
schedule_activate_all (self);