summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nm-manager.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c
index a900acbcd4..3150aefd9a 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -4673,6 +4673,15 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError *
return FALSE;
}
+ if ( nm_active_connection_get_activation_reason (active) == NM_ACTIVATION_REASON_AUTOCONNECT
+ && nm_settings_connection_autoconnect_blocked_reason_get (parent_con,
+ NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST)) {
+ g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_DEPENDENCY_FAILED,
+ "the parent connection of %s cannot autoactivate because it is blocked due to user request",
+ nm_device_get_iface (device));
+ return FALSE;
+ }
+
parent_ac = nm_manager_activate_connection (self,
parent_con,
NULL,