commit 906800b173da0a20f23ac0cf063bb0f69e612738
author Pierre Ossman <ossman@cendio.se> Wed Sep 17 16:39:28 2014 +0200
committer Pierre Ossman <ossman@cendio.se> Wed Sep 17 16:39:28 2014 +0200
tree c81000c9bdd9ac052651c525ff0fa52e9220cad5
parent 0f15ee3b5488b7384b1aa80dfceff6f2115e3517

Give a correct list of valid security schemes

common/rfb/SecurityClient.cxx

diff --git a/common/rfb/SecurityClient.cxx b/common/rfb/SecurityClient.cxx
index 4173c74..fe34712 100644
--- a/common/rfb/SecurityClient.cxx
+++ b/common/rfb/SecurityClient.cxx
@@ -43,7 +43,11 @@
 
 StringParameter SecurityClient::secTypes
 ("SecurityTypes",
- "Specify which security scheme to use (None, VncAuth)",
+ "Specify which security scheme to use (None, VncAuth, Plain"
+#ifdef HAVE_GNUTLS
+ ", TLSNone, TLSVnc, TLSPlain, X509None, X509Vnc, X509Plain"
+#endif
+ ")",
 #ifdef HAVE_GNUTLS
  "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
 #else

common/rfb/SecurityServer.cxx

diff --git a/common/rfb/SecurityServer.cxx b/common/rfb/SecurityServer.cxx
index 76ece77..5bd7b2c 100644
--- a/common/rfb/SecurityServer.cxx
+++ b/common/rfb/SecurityServer.cxx
@@ -37,7 +37,11 @@
 
 StringParameter SecurityServer::secTypes
 ("SecurityTypes",
- "Specify which security scheme to use (None, VncAuth)",
+ "Specify which security scheme to use (None, VncAuth, Plain"
+#ifdef HAVE_GNUTLS
+ ", TLSNone, TLSVnc, TLSPlain, X509None, X509Vnc, X509Plain"
+#endif
+ ")",
 #ifdef HAVE_GNUTLS
  "VncAuth,TLSVnc",
 #else