[Bugfix] Improve r4300 - also honor server's sectype order for VeNCrypt subtypes.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4302 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/CSecurityVeNCrypt.cxx b/common/rfb/CSecurityVeNCrypt.cxx
index 9c2ceba..77eeef9 100644
--- a/common/rfb/CSecurityVeNCrypt.cxx
+++ b/common/rfb/CSecurityVeNCrypt.cxx
@@ -147,13 +147,13 @@
chosenType = secTypeInvalid;
U8 i;
list<U32>::iterator j;
- list<U32> preferredList;
+ list<U32> secTypes;
- /* Try preferred choice */
- preferredList = security->GetEnabledExtSecTypes();
+ secTypes = security->GetEnabledExtSecTypes();
- for (j = preferredList.begin(); j != preferredList.end(); j++) {
- for (i = 0; i < nAvailableTypes; i++) {
+ /* Honor server's security type order */
+ for (i = 0; i < nAvailableTypes; i++) {
+ for (j = secTypes.begin(); j != secTypes.end(); j++) {
if (*j == availableTypes[i]) {
chosenType = *j;
break;