From: Adam Tkac <atkac@redhat.com>
Date: Thu, 12 Aug 2010 14:24:43 +0000 (+0000)
Subject: [Development] Set default security types as follows:
X-Git-Tag: v1.0.90~191
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=80fb7efb29af87919a35bb8a609f50b29728d57e;p=tigervnc.git

[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 600df14d..71e45de8 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -55,12 +55,22 @@ UserPasswdGetter *CSecurity::upg = NULL;
 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)
 {