[Development] Set default security types as follows:
1. gnutls support is compiled in:
- server: VeNCrypt,TLSVnc,VncAuth
- client: VeNCrypt,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None
2. gnutls support is disabled:
- server: VncAuth
- client: VncAuth,None
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4123 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index 600df14..71e45de 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -55,12 +55,22 @@
StringParameter Security::secTypesViewer
("SecurityTypes",
"Specify which security scheme to use (None, VncAuth)",
- "VncAuth", ConfViewer);
+#ifdef HAVE_GNUTLS
+ "VeNCrypt,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
+#else
+ "VncAuth,None",
+#endif
+ConfViewer);
StringParameter Security::secTypesServer
("SecurityTypes",
"Specify which security scheme to use (None, VncAuth)",
- "VncAuth", ConfServer);
+#ifdef HAVE_GNUTLS
+ "VeNCrypt,TLSVnc,VncAuth",
+#else
+ "VncAuth",
+#endif
+ConfServer);
Security::Security(SecurityClassType secClassType)
{