diff options
| author | Adam Tkac <atkac@redhat.com> | 2010-08-12 14:24:43 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2010-08-12 14:24:43 +0000 |
| commit | 80fb7efb29af87919a35bb8a609f50b29728d57e (patch) | |
| tree | 54b9b3e78f1cfb150029cb5317d4915f448c099f /common | |
| parent | fb993153a026e5bfa3e7f87a34ca7155aea555d3 (diff) | |
| download | tigervnc-80fb7efb29af87919a35bb8a609f50b29728d57e.tar.gz tigervnc-80fb7efb29af87919a35bb8a609f50b29728d57e.zip | |
[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
Diffstat (limited to 'common')
| -rw-r--r-- | common/rfb/Security.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
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) { |