[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 6175ec1..cc4889a 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -156,14 +156,13 @@
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 @@
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]";
}
}