Signed-off-by: Martin Koegler <mkoeg...@auto.tuwien.ac.at>
---
 common/rfb/Security.cxx      |    6 ++++++
 common/rfb/Security.h        |    1 +
 unix/vncviewer/vncviewer.cxx |    1 +
 win/vncviewer/vncviewer.cxx  |    1 +
 4 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index 7049439..8ea7572 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -53,6 +53,12 @@ StringParameter Security::secTypes
  "Specify which security scheme to use (None, VncAuth)",
  "VncAuth");
 
+void Security::enableClientTypes()
+{
+  /* override default value */
+  secTypes.setDefaultStr("None,VncAuth");
+}
+
 Security::Security(void)
 {
   char *secTypesStr = secTypes.getData();
diff --git a/common/rfb/Security.h b/common/rfb/Security.h
index f4c9681..dd5343a 100644
--- a/common/rfb/Security.h
+++ b/common/rfb/Security.h
@@ -76,6 +76,7 @@ namespace rfb {
     CSecurity* GetCSecurity(rdr::U8 secType);
 
     static StringParameter secTypes;
+    static void enableClientTypes();
 
     /*
      * Use variable directly instead of dumb get/set methods. It is used
diff --git a/unix/vncviewer/vncviewer.cxx b/unix/vncviewer/vncviewer.cxx
index 80d65c5..3a02ee3 100644
--- a/unix/vncviewer/vncviewer.cxx
+++ b/unix/vncviewer/vncviewer.cxx
@@ -270,6 +270,7 @@ int main(int argc, char** argv)
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE_NAME, LOCALEDIR);
   textdomain(PACKAGE_NAME);
+  rfb::Security::enableClientTypes();
 
   const char englishAbout[] = N_("TigerVNC Viewer for X version %s - built 
%s\n"
                                 "Copyright (C) 2002-2005 RealVNC Ltd.\n"
diff --git a/win/vncviewer/vncviewer.cxx b/win/vncviewer/vncviewer.cxx
index 8a741f7..f30510f 100644
--- a/win/vncviewer/vncviewer.cxx
+++ b/win/vncviewer/vncviewer.cxx
@@ -185,6 +185,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prevInst, 
char* cmdLine, int cmdSho
 
     // - By default, just log errors to stderr
     logParams.setDefault("*:stderr:0");
+    rfb::Security::enableClientTypes();
 
     // - Process the command-line
     int argc = __argc;
-- 
1.6.4.2


------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Tigervnc-devel mailing list
Tigervnc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-devel

Reply via email to