Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: x2goclient.git - master (branch) updated: 4.0.1.1-11-gcf33d55
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Thursday 24th October 2013 08:11:21 UTC (over 3 years ago)
The branch, master has been updated
       via  cf33d551c21c86c7ea654914930550b0fd0b2c79 (commit)
      from  8cade0ed5bc2e7595d394857f56308c55138f862 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cf33d551c21c86c7ea654914930550b0fd0b2c79
Author: Mike Gabriel 
Date:   Thu Oct 24 10:10:53 2013 +0200

    Store broker HTTPS certificate exceptions in $HOME/.x2go/ssl/exceptions
(before: $HOME/ssl/exceptions). (Fixes: #328).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog     |    3 +++
 httpbrokerclient.cpp |   10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 05b5189..e484ba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low
     + Provide Keywords: key in .desktop file.
     + Add NSIS packaging files for win32 builds to source tree.
       (Files provided by Oleksandr Shneyder, thanks!!!).
+    + Store broker HTTPS certificate exceptions in
+      $HOME/.x2go/ssl/exceptions (before: $HOME/ssl/exceptions).
+      (Fixes: #328).
   * Pull-in packaging changes from Debian.
 
   [ Ricardo Díaz Martín ]
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index 603aadd..6d16b7b 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -532,10 +532,10 @@ void HttpBrokerClient::slotSslErrors ( const
QList & errors )
     fname=fname.replace(":","_");
     QUrl lurl ( config->brokerurl );
     QString homeDir=mainWindow->getHomeDirectory();
-    if ( QFile::exists ( homeDir+"/ssl/exceptions/"+
+    if ( QFile::exists ( homeDir+"/.x2go/ssl/exceptions/"+
                          lurl.host() +"/"+fname ) )
     {
-        QFile fl ( homeDir+"/ssl/exceptions/"+
+        QFile fl ( homeDir+"/.x2go/ssl/exceptions/"+
                    lurl.host() +"/"+fname );
         fl.open ( QIODevice::ReadOnly | QIODevice::Text );
         QSslCertificate mcert ( &fl );
@@ -606,14 +606,14 @@ void HttpBrokerClient::slotSslErrors ( const
QList & errors )
     {
         x2goDebug<<"accept certificate";
         QDir dr;
-        dr.mkpath ( homeDir+"/ssl/exceptions/"+lurl.host() +"/" );
-        QFile fl ( homeDir+"/ssl/exceptions/"+
+        dr.mkpath ( homeDir+"/.x2go/ssl/exceptions/"+lurl.host() +"/" );
+        QFile fl ( homeDir+"/.x2go/ssl/exceptions/"+
                    lurl.host() +"/"+fname );
         fl.open ( QIODevice::WriteOnly | QIODevice::Text );
         QTextStream ( &fl ) <ignoreSslErrors();
-        x2goDebug<<"store certificate in  "<https://lists.berlios.de/mailman/listinfo/x2go-commits
 
CD: 28ms