[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.cpp: work around changed SSH host key locations in OS X 10.11+. Fixes: #1079.

git-admin at x2go.org git-admin at x2go.org
Sat Aug 27 18:36:35 CEST 2016


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 742205ca52694490a5130f6f00ff14e079d6b353
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Aug 27 07:52:16 2016 +0200

    src/onmainwindow.cpp: work around changed SSH host key locations in OS X 10.11+. Fixes: #1079.
    
    Also check /etc/ssh/ for keys.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |   16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 94eed90..394a8dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
     - src/help.h: typo fix in comment only.
     - src/onmainwindow.cpp: add some comments related to maybe using
       add_to_path ().
+    - src/onmainwindow.cpp: work around changed SSH host key locations in OS X
+      10.11+. Fixes: #1079. Also check /etc/ssh/ for keys.
   * debian/control:
     - Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
     - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 77880f4..b4413f0 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -8059,7 +8059,21 @@ QString ONMainWindow::createRSAKey()
 #endif
 
 #ifdef Q_OS_DARWIN
-    rsa.setFileName ( "/etc/ssh_host_rsa_key.pub" );
+    {
+        /* OS X 10.11+ changed the key location to /etc/ssh/. */
+        QDir rsa_host_key ("/etc/ssh/ssh_host_rsa_key.pub");
+
+        if (!(rsa_host_key.exists ())) {
+            rsa_host_key = QDir ("/etc/ssh_host_rsa_key.pub");
+
+            if (!(rsa_host_key.exists ())) {
+                printSshDError_noHostPubKey ();
+                return QString::null;
+            }
+        }
+
+        rsa.setFileName (rsa_host_key.absolutePath ());
+    }
 #endif
     if ( !rsa.open ( QIODevice::ReadOnly | QIODevice::Text ) )
     {

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list