Magellan Linux

Contents of /trunk/tigervnc/patches/tigervnc-1.1.0-rh692048.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1555 - (show annotations) (download)
Tue Nov 8 18:52:01 2011 UTC (12 years, 5 months ago) by niro
File size: 2113 byte(s)
added fedora patches
1 diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx
2 --- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100
3 +++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx 2011-03-31 09:47:34.519099718 +0200
4 @@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes
5 ("SecurityTypes",
6 "Specify which security scheme to use (None, VncAuth)",
7 #ifdef HAVE_GNUTLS
8 - "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
9 + "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
10 #else
11 "VncAuth,None",
12 #endif
13 diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx
14 --- tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100
15 +++ tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx 2011-03-31 09:47:34.519099718 +0200
16 @@ -67,7 +67,6 @@ const std::list<rdr::U8> Security::GetEn
17 list<rdr::U8> result;
18 list<U32>::iterator i;
19
20 - result.push_back(secTypeVeNCrypt);
21 for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
22 if (*i < 0x100)
23 result.push_back(*i);
24 @@ -105,8 +104,6 @@ bool Security::IsSupported(U32 secType)
25 for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
26 if (*i == secType)
27 return true;
28 - if (secType == secTypeVeNCrypt)
29 - return true;
30
31 return false;
32 }
33 diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx
34 --- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 2011-02-21 14:50:17.000000000 +0100
35 +++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx 2011-03-31 10:06:43.595362302 +0200
36 @@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes
37 ("SecurityTypes",
38 "Specify which security scheme to use (None, VncAuth)",
39 #ifdef HAVE_GNUTLS
40 - "VncAuth,TLSVnc",
41 + "VncAuth",
42 #else
43 "VncAuth",
44 #endif