From: Adam Tkac <atkac@redhat.com>
Date: Tue, 20 Jul 2010 15:12:41 +0000 (+0000)
Subject: [Development] Minor fixes in previous commit.
X-Git-Tag: v1.0.90~214
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=957a5aea6412e6371728a8c2a102a4673383b5b4;p=tigervnc.git

[Development] Minor fixes in previous commit.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4099 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index 6175ec1c..cc4889a7 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -156,14 +156,13 @@ rdr::U32 rfb::secTypeNum(const char* name)
   if (strcasecmp(name, "VeNCrypt") == 0)   return secTypeVeNCrypt;
 
   /* VeNCrypt subtypes */
+  if (strcasecmp(name, "Plain") == 0)      return secTypePlain;
   if (strcasecmp(name, "TLSNone") == 0)    return secTypeTLSNone;
   if (strcasecmp(name, "TLSVnc") == 0)     return secTypeTLSVnc;
-#if 0 /* Currently not implemented */
+  if (strcasecmp(name, "TLSPlain") == 0)   return secTypeTLSPlain;
   if (strcasecmp(name, "X509None") == 0)   return secTypeX509None;
   if (strcasecmp(name, "X509Vnc") == 0)    return secTypeX509Vnc;
-  if (strcasecmp(name, "TLSPlain") == 0)   return secTypeTLSPlain;
   if (strcasecmp(name, "X509Plain") == 0)  return secTypeX509Plain;
-#endif
 
   return secTypeInvalid;
 }
@@ -181,15 +180,13 @@ const char* rfb::secTypeName(rdr::U32 num)
   case secTypeVeNCrypt:   return "VeNCrypt";
 
   /* VeNCrypt subtypes */
+  case secTypePlain:      return "Plain";
   case secTypeTLSNone:    return "TLSNone";
   case secTypeTLSVnc:     return "TLSVnc";
-#if 0 /* Currently not implemented */
-  case secTypePlain:      return "Plain";
   case secTypeTLSPlain:   return "TLSPlain";
   case secTypeX509None:   return "X509None";
   case secTypeX509Vnc:    return "X509Vnc";
   case secTypeX509Plain:  return "X509Plain";
-#endif
   default:                return "[unknown secType]";
   }
 }