chromeos/network/onc/onc_translation_tables.cc - Issue 12676017: Adding policy support to the new network configuration stack.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/network/onc/onc_translation_tables.cc

Issue 12676017: Adding policy support to the new network configuration stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed Julian's comments. Reuploaded with rebase. Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chromeos/network/onc/onc_translation_tables.cc

diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc

index 74a2f94cd0577e4940adbce9869597823262da60..8496aebf9c300ba11e9b64ad8b0ae9d3495ecdd5 100644

--- a/chromeos/network/onc/onc_translation_tables.cc

+++ b/chromeos/network/onc/onc_translation_tables.cc

@@ -190,11 +190,13 @@ const StringTranslationEntry kVPNTypeTable[] = {

{ NULL }

};

+// The first matching line is chosen.

const StringTranslationEntry kWiFiSecurityTable[] = {

{ wifi::kNone, flimflam::kSecurityNone },

{ wifi::kWEP_PSK, flimflam::kSecurityWep },

{ wifi::kWPA_PSK, flimflam::kSecurityPsk },

{ wifi::kWPA_EAP, flimflam::kSecurity8021x },

+ { wifi::kWPA_PSK, flimflam::kSecurityRsn },

{ NULL }

};