Skip to content

Commit dcf94bc

Browse files
committed
VPN: Disable autoconnect by default
[email protected] (cherry picked from commit b556c19) Bug: 803497 Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I376899c280da4e017c729ebf462e9f30f24fb022 Reviewed-on: https://chromium-review.googlesource.com/877220 Commit-Queue: Steven Bennetts <[email protected]> Reviewed-by: Kevin Cernekee <[email protected]> Reviewed-by: Toni Barzic <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#530904} Reviewed-on: https://chromium-review.googlesource.com/882549 Reviewed-by: Steven Bennetts <[email protected]> Cr-Commit-Position: refs/branch-heads/3325@{#50} Cr-Branched-From: bc084a8-refs/heads/master@{#530369}
1 parent bcb0a47 commit dcf94bc

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

ui/webui/resources/cr_components/chromeos/network/network_config.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,12 +365,13 @@ Polymer({
365365

366366
var propertiesToSet = this.getPropertiesToSet_();
367367
if (!this.guid || this.getSource_() == CrOnc.Source.NONE) {
368-
// New network configurations default to 'AutoConnect' unless prohibited
369-
// by policy.
368+
// New non VPN network configurations default to 'AutoConnect' unless
369+
// prohibited by policy.
370+
var prohibitAutoConnect = this.globalPolicy &&
371+
this.globalPolicy.AllowOnlyPolicyNetworksToConnect;
370372
CrOnc.setTypeProperty(
371373
propertiesToSet, 'AutoConnect',
372-
!(this.globalPolicy &&
373-
this.globalPolicy.AllowOnlyPolicyNetworksToConnect));
374+
this.type != CrOnc.Type.VPN && !prohibitAutoConnect);
374375

375376
// Create the configuration, then connect to it in the callback.
376377
this.networkingPrivate.createNetwork(

0 commit comments

Comments
 (0)